@lodestar/builder 1.50.0-dev.ebecebb9ba → 1.50.0-dev.f0b11f836e

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.ebecebb9ba",
+  "version": "1.50.0-dev.f0b11f836e",
   "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.ebecebb9ba",
-    "@lodestar/config": "^1.50.0-dev.ebecebb9ba",
-    "@lodestar/params": "^1.50.0-dev.ebecebb9ba",
-    "@lodestar/state-transition": "^1.50.0-dev.ebecebb9ba",
-    "@lodestar/types": "^1.50.0-dev.ebecebb9ba",
-    "@lodestar/utils": "^1.50.0-dev.ebecebb9ba"
+    "@lodestar/api": "^1.50.0-dev.f0b11f836e",
+    "@lodestar/config": "^1.50.0-dev.f0b11f836e",
+    "@lodestar/params": "^1.50.0-dev.f0b11f836e",
+    "@lodestar/state-transition": "^1.50.0-dev.f0b11f836e",
+    "@lodestar/types": "^1.50.0-dev.f0b11f836e",
+    "@lodestar/utils": "^1.50.0-dev.f0b11f836e"
   },
   "devDependencies": {
-    "@lodestar/logger": "^1.50.0-dev.ebecebb9ba",
-    "@lodestar/test-utils": "^1.50.0-dev.ebecebb9ba"
+    "@lodestar/logger": "^1.50.0-dev.f0b11f836e",
+    "@lodestar/test-utils": "^1.50.0-dev.f0b11f836e"
   },
-  "gitHead": "f829ef2c4c4af7d680e21f6a0da1d300b9e798d7"
+  "gitHead": "070642a4b377824ceabe7efdaf2bd3dc40d394dd"
 }

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

@@ -32,6 +32,7 @@ type MutableBidLedgerRecord = SubmittedBid & {
 export enum BidLedgerErrorCode {
   INVALID_BID_VALUE = "BID_LEDGER_ERROR_INVALID_BID_VALUE",
   DUPLICATE_BID = "BID_LEDGER_ERROR_DUPLICATE_BID",
+  BID_TOO_OLD = "BID_LEDGER_ERROR_BID_TOO_OLD",
   REVEAL_CONFLICT = "BID_LEDGER_ERROR_REVEAL_CONFLICT",
   UNSETTLED_VALUE_OVERFLOW = "BID_LEDGER_ERROR_UNSETTLED_VALUE_OVERFLOW",
 }
@@ -47,6 +48,11 @@ export type BidLedgerErrorType =
       parentBlockHash: RootHex;
       parentBlockRoot: RootHex;
     }
+  | {
+      code: BidLedgerErrorCode.BID_TOO_OLD;
+      slot: Slot;
+      pruneCutoffSlot: Slot;
+    }
   | {
       code: BidLedgerErrorCode.REVEAL_CONFLICT;
       blockRoot: RootHex;
@@ -69,11 +75,28 @@ const KEEP_SLOTS = RECORD_RETENTION_EPOCHS * SLOTS_PER_EPOCH;
 export class BidLedger {
   private readonly bidsBySlot = new Map<Slot, Map<string, MutableBidLedgerRecord>>();
   private readonly revealedPayloadByBlockRoot = new Map<RootHex, RevealedPayload>();
+  private pruneCutoffSlot = 0;
 
   hasSubmitted(slot: Slot, parentBlockHash: RootHex, parentBlockRoot: RootHex): boolean {
     return this.bidsBySlot.get(slot)?.has(tupleKey(parentBlockHash, parentBlockRoot)) ?? false;
   }
 
+  assertCanRecordBid({
+    slot,
+    parentBlockHash,
+    parentBlockRoot,
+  }: Pick<SubmittedBid, "slot" | "parentBlockHash" | "parentBlockRoot">): void {
+    if (slot < this.pruneCutoffSlot) {
+      throw new BidLedgerError({code: BidLedgerErrorCode.BID_TOO_OLD, slot, pruneCutoffSlot: this.pruneCutoffSlot});
+    }
+    if (this.hasSubmitted(slot, parentBlockHash, parentBlockRoot)) {
+      throw new BidLedgerError(
+        {code: BidLedgerErrorCode.DUPLICATE_BID, slot, parentBlockHash, parentBlockRoot},
+        `Bid already recorded slot=${slot} parentBlockHash=${parentBlockHash} parentBlockRoot=${parentBlockRoot}`
+      );
+    }
+  }
+
   recordBid(bid: SubmittedBid): BidLedgerRecord {
     if (!Number.isSafeInteger(bid.valueGwei) || bid.valueGwei < 0) {
       throw new BidLedgerError(
@@ -82,6 +105,7 @@ export class BidLedger {
       );
     }
 
+    this.assertCanRecordBid(bid);
     let bidsForSlot = this.bidsBySlot.get(bid.slot);
     if (bidsForSlot === undefined) {
       bidsForSlot = new Map();
@@ -89,18 +113,6 @@ export class BidLedger {
     }
 
     const key = tupleKey(bid.parentBlockHash, bid.parentBlockRoot);
-    if (bidsForSlot.has(key)) {
-      throw new BidLedgerError(
-        {
-          code: BidLedgerErrorCode.DUPLICATE_BID,
-          slot: bid.slot,
-          parentBlockHash: bid.parentBlockHash,
-          parentBlockRoot: bid.parentBlockRoot,
-        },
-        `Bid already recorded slot=${bid.slot} parentBlockHash=${bid.parentBlockHash} parentBlockRoot=${bid.parentBlockRoot}`
-      );
-    }
-
     const record = {...bid, wonBlockRoots: new Set<RootHex>(), paymentSettled: false};
     bidsForSlot.set(key, record);
     return toRecord(record);
@@ -116,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);
@@ -198,9 +215,11 @@ export class BidLedger {
   }
 
   prune(currentSlot: Slot): number {
+    // Pruning must not make an expired slot eligible for another submission.
+    this.pruneCutoffSlot = Math.max(this.pruneCutoffSlot, currentSlot - KEEP_SLOTS);
     let removed = 0;
     for (const [slot, bidsForSlot] of this.bidsBySlot) {
-      if (slot >= currentSlot - KEEP_SLOTS) {
+      if (slot >= this.pruneCutoffSlot) {
         continue;
       }
 
@@ -216,7 +235,7 @@ export class BidLedger {
     }
 
     for (const [blockRoot, revealedPayload] of this.revealedPayloadByBlockRoot) {
-      if (revealedPayload.slot < currentSlot - KEEP_SLOTS) {
+      if (revealedPayload.slot < this.pruneCutoffSlot) {
         this.revealedPayloadByBlockRoot.delete(blockRoot);
       }
     }

package/src/services/bidPublisher.ts

@@ -0,0 +1,95 @@
+import type {ApiClient} from "@lodestar/api";
+import type {ChainForkConfig} from "@lodestar/config";
+import {isForkPostGloas} from "@lodestar/params";
+import type {BuilderIndex, RootHex, Slot, gloas, heze} from "@lodestar/types";
+import {sszTypesFor} from "@lodestar/types";
+import {LodestarError, toRootHex} from "@lodestar/utils";
+import type {BidIdentity, BidLedger} from "./bidLedger.js";
+import type {BuilderSigner} from "./builderSigner.js";
+
+export type BidPublisherModules = {
+  api: ApiClient;
+  config: ChainForkConfig;
+  signer: BuilderSigner;
+  ledger: BidLedger;
+  builderIndex: BuilderIndex;
+  hasPayload: (identity: BidIdentity) => boolean;
+};
+
+export enum BidPublisherErrorCode {
+  BUILDER_INDEX_MISMATCH = "BID_PUBLISHER_ERROR_BUILDER_INDEX_MISMATCH",
+  PAYLOAD_NOT_RETAINED = "BID_PUBLISHER_ERROR_PAYLOAD_NOT_RETAINED",
+  PRE_GLOAS_BID = "BID_PUBLISHER_ERROR_PRE_GLOAS_BID",
+}
+
+export type BidPublisherErrorType =
+  | {
+      code: BidPublisherErrorCode.PRE_GLOAS_BID;
+      slot: Slot;
+    }
+  | {
+      code: BidPublisherErrorCode.BUILDER_INDEX_MISMATCH;
+      builderIndex: BuilderIndex;
+      bidBuilderIndex: BuilderIndex;
+    }
+  | {
+      code: BidPublisherErrorCode.PAYLOAD_NOT_RETAINED;
+      slot: Slot;
+      parentBlockHash: RootHex;
+      parentBlockRoot: RootHex;
+      blockHash: RootHex;
+    };
+
+export class BidPublisherError extends LodestarError<BidPublisherErrorType> {}
+
+/** Signs and submits a bid only if its payload is retained locally. */
+export class BidPublisher {
+  constructor(private readonly modules: BidPublisherModules) {}
+
+  publish(bid: heze.ExecutionPayloadBid, signal: AbortSignal): Promise<heze.SignedExecutionPayloadBid>;
+  publish(bid: gloas.ExecutionPayloadBid, signal: AbortSignal): Promise<gloas.SignedExecutionPayloadBid>;
+  async publish(bid: gloas.ExecutionPayloadBid, signal: AbortSignal): Promise<gloas.SignedExecutionPayloadBid> {
+    signal.throwIfAborted();
+
+    const {api, config, builderIndex, hasPayload, ledger, signer} = this.modules;
+    const fork = config.getForkName(bid.slot);
+    if (!isForkPostGloas(fork)) {
+      throw new BidPublisherError({code: BidPublisherErrorCode.PRE_GLOAS_BID, slot: bid.slot});
+    }
+    if (bid.builderIndex !== builderIndex) {
+      throw new BidPublisherError(
+        {
+          code: BidPublisherErrorCode.BUILDER_INDEX_MISMATCH,
+          builderIndex,
+          bidBuilderIndex: bid.builderIndex,
+        },
+        `Bid builder index does not match local builder index builderIndex=${builderIndex} bidBuilderIndex=${bid.builderIndex}`
+      );
+    }
+
+    const identity: BidIdentity = {
+      slot: bid.slot,
+      parentBlockHash: toRootHex(bid.parentBlockHash),
+      parentBlockRoot: toRootHex(bid.parentBlockRoot),
+      blockHash: toRootHex(bid.blockHash),
+    };
+    if (!hasPayload(identity)) {
+      throw new BidPublisherError(
+        {code: BidPublisherErrorCode.PAYLOAD_NOT_RETAINED, ...identity},
+        `Bid payload is not retained slot=${identity.slot} parentBlockHash=${identity.parentBlockHash} parentBlockRoot=${identity.parentBlockRoot} blockHash=${identity.blockHash}`
+      );
+    }
+
+    ledger.assertCanRecordBid(identity);
+
+    const signedExecutionPayloadBid = signer.signExecutionPayloadBid(bid);
+    const signedBidRoot = toRootHex(
+      sszTypesFor(fork, "SignedExecutionPayloadBid").hashTreeRoot(signedExecutionPayloadBid)
+    );
+    ledger.recordBid({...identity, valueGwei: bid.value, signedBidRoot});
+
+    const response = await api.beacon.publishExecutionPayloadBid({signedExecutionPayloadBid}, {signal});
+    response.assertOk();
+    return signedExecutionPayloadBid;
+  }
+}

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};
+  }
+}

package/src/services/blockObserver.ts

@@ -47,55 +47,17 @@ export class BlockObserver {
     this.retries = retries;
     this.retryDelay = retryDelay;
     this.maxSeenBlockRoots = maxSeenBlockRoots;
+    this.logger.info("Block observer initialized", {retries, retryDelay, maxSeenBlockRoots});
   }
 
   /**
-   * Register a block consumer. Consumers that require complete observation must register before {@link start}, because
+   * Register a block consumer. Consumers that require complete observation must register before event delivery, because
    * roots observed before registration remain consumed until normal FIFO eviction.
    */
   runOnBlock(fn: RunOnBlockFn): void {
     this.fns.push(fn);
   }
 
-  start(signal: AbortSignal): void {
-    this.logger.info("Subscribing to block events", {
-      retries: this.retries,
-      retryDelay: this.retryDelay,
-      maxSeenBlockRoots: this.maxSeenBlockRoots,
-    });
-
-    this.api.events
-      .eventstream({
-        topics: [EventType.block],
-        signal,
-        onEvent: (event) => {
-          if (event.type !== EventType.block) {
-            this.logger.debug("Ignoring unexpected beacon event", {eventType: event.type});
-            return;
-          }
-
-          void this.processBlockEvent(event.message, signal);
-        },
-        onError: (error) => {
-          this.logger.error("Failed to receive block event", {}, error);
-        },
-        onClose: () => {
-          if (signal.aborted) {
-            this.logger.debug("Closed stream for block events");
-          } else {
-            this.logger.error("Block event stream closed unexpectedly", {});
-          }
-        },
-      })
-      .catch((error: unknown) => {
-        this.logger.error(
-          "Failed to subscribe to block events",
-          {},
-          error instanceof Error ? error : Error(String(error))
-        );
-      });
-  }
-
   async processBlockEvent(event: BlockEvent, signal: AbortSignal): Promise<void> {
     try {
       const {slot, block: blockRoot, executionOptimistic} = event;
@@ -145,7 +107,7 @@ export class BlockObserver {
         return null;
       });
 
-      if (response === null) {
+      if (response === null || signal.aborted) {
         return;
       }
 

package/src/services/builderSigner.ts

@@ -1,7 +1,7 @@
 import {PublicKey, SecretKey} from "@chainsafe/lodestar-z/blst";
 import {BeaconConfig} from "@lodestar/config";
 import {getExecutionPayloadBidSigningRoot, getExecutionPayloadEnvelopeSigningRoot} from "@lodestar/state-transition";
-import {gloas} from "@lodestar/types";
+import {gloas, heze} from "@lodestar/types";
 
 export type Keypair = {publicKey: PublicKey; secretKey: SecretKey};
 
@@ -23,6 +23,8 @@ export class BuilderSigner {
     };
   }
 
+  signExecutionPayloadBid(bid: heze.ExecutionPayloadBid): heze.SignedExecutionPayloadBid;
+  signExecutionPayloadBid(bid: gloas.ExecutionPayloadBid): gloas.SignedExecutionPayloadBid;
   signExecutionPayloadBid(bid: gloas.ExecutionPayloadBid): gloas.SignedExecutionPayloadBid {
     const signingRoot = getExecutionPayloadBidSigningRoot(this.config, bid);