@lodestar/beacon-node 1.50.0-dev.fef46df5ba → 1.50.0

package/lib/chain/shufflingCache.js

@@ -1,11 +1,9 @@
 import { GENESIS_EPOCH } from "@lodestar/params";
 import { getAttestingIndices, getBeaconCommittees, getIndexedAttestation, } from "@lodestar/state-transition";
-import { LodestarError, MapDef, pruneSetToMax } from "@lodestar/utils";
+import { LodestarError, MapDef } from "@lodestar/utils";
 /**
- * Same value to CheckpointBalancesCache, with the assumption that we don't have to use it for old epochs. In the worse case:
- * - when loading state bytes from disk, we need to compute shuffling for all epochs (~1s as of Sep 2023)
- * - don't have shuffling to verify attestations, need to do 1 epoch transition to add shuffling to this cache. This never happens
- * with default chain option of maxSkipSlots = 32
+ * Lookahead duties, gossip validation, and block production need epochs n-1, n, and n+1 for current epoch n.
+ * Keep the 4 highest epochs so that it works for epoch rotation.
  **/
 const MAX_EPOCHS = 4;
 /**
@@ -18,16 +16,20 @@ var CacheItemType;
     CacheItemType[CacheItemType["shuffling"] = 0] = "shuffling";
     CacheItemType[CacheItemType["promise"] = 1] = "promise";
 })(CacheItemType || (CacheItemType = {}));
+export var ShufflingPromiseCancelReason;
+(function (ShufflingPromiseCancelReason) {
+    ShufflingPromiseCancelReason["regenError"] = "regen_error";
+    ShufflingPromiseCancelReason["decisionRootMismatch"] = "decision_root_mismatch";
+    ShufflingPromiseCancelReason["pruned"] = "pruned";
+})(ShufflingPromiseCancelReason || (ShufflingPromiseCancelReason = {}));
 /**
- * A shuffling cache to help:
- * - get committee quickly for attestation verification
- * - if a shuffling is not available (which does not happen with default chain option of maxSkipSlots = 32), track a promise to make sure we don't compute the same shuffling twice
- * - skip computing shuffling when loading state bytes from disk
+ * Cache recent epoch shufflings for lookahead duties, gossip validation, and block production.
+ * Pending promises deduplicate computation of missing shufflings.
  */
 export class ShufflingCache {
     metrics;
     logger;
-    /** LRU cache implemented as a map, pruned every time we add an item */
+    /** Pruned to the `maxEpochs` highest epochs every time we add a shuffling */
     itemsByDecisionRootByEpoch = new MapDef(() => new Map());
     maxEpochs;
     constructor(metrics = null, logger = null, opts = {}, precalculatedShufflings) {
@@ -35,6 +37,7 @@ export class ShufflingCache {
         this.logger = logger;
         if (metrics) {
             metrics.shufflingCache.size.addCollect(() => metrics.shufflingCache.size.set(Array.from(this.itemsByDecisionRootByEpoch.values()).reduce((total, innerMap) => total + innerMap.size, 0)));
+            metrics.shufflingCache.epochs.addCollect(() => metrics.shufflingCache.epochs.set(this.itemsByDecisionRootByEpoch.size));
         }
         this.maxEpochs = opts.maxShufflingCacheEpochs ?? MAX_EPOCHS;
         precalculatedShufflings?.map(({ shuffling, decisionRoot }) => {
@@ -76,7 +79,7 @@ export class ShufflingCache {
      * Return null if we don't have a shuffling for this epoch and dependentRootHex.
      */
     async get(epoch, decisionRoot) {
-        const cacheItem = this.itemsByDecisionRootByEpoch.getOrDefault(epoch).get(decisionRoot);
+        const cacheItem = this.itemsByDecisionRootByEpoch.get(epoch)?.get(decisionRoot);
         if (cacheItem === undefined) {
             this.metrics?.shufflingCache.miss.inc();
             return null;
@@ -89,12 +92,10 @@ export class ShufflingCache {
         return cacheItem.promise;
     }
     /**
-     * Get a shuffling synchronously, return null if not present.
-     * The only time we have a promise cache item is when we regen shuffling for attestation, which never happens
-     * with default chain option.
+     * Get a shuffling synchronously, return null if not present or if it's still being computed.
      */
     getSync(epoch, decisionRoot) {
-        const cacheItem = this.itemsByDecisionRootByEpoch.getOrDefault(epoch).get(decisionRoot);
+        const cacheItem = this.itemsByDecisionRootByEpoch.get(epoch)?.get(decisionRoot);
         if (cacheItem === undefined) {
             this.metrics?.shufflingCache.miss.inc();
             return null;
@@ -111,7 +112,7 @@ export class ShufflingCache {
      * `NativeBeaconStateView`.
      */
     has(epoch, decisionRoot) {
-        const cacheItem = this.itemsByDecisionRootByEpoch.getOrDefault(epoch).get(decisionRoot);
+        const cacheItem = this.itemsByDecisionRootByEpoch.get(epoch)?.get(decisionRoot);
         return cacheItem !== undefined && isShufflingCacheItem(cacheItem);
     }
     /**
@@ -131,6 +132,23 @@ export class ShufflingCache {
             this.set(state.getNextShuffling(), state.nextDecisionRoot);
         }
     }
+    /**
+     * Resolve a pending promise with null so that waiters don't hang, then remove it.
+     */
+    cancelPromise(epoch, decisionRoot, reason) {
+        const itemsByDecisionRoot = this.itemsByDecisionRootByEpoch.get(epoch);
+        const cacheItem = itemsByDecisionRoot?.get(decisionRoot);
+        if (itemsByDecisionRoot === undefined || cacheItem === undefined || !isPromiseCacheItem(cacheItem)) {
+            return;
+        }
+        cacheItem.resolveFn(null);
+        itemsByDecisionRoot.delete(decisionRoot);
+        if (itemsByDecisionRoot.size === 0) {
+            this.itemsByDecisionRootByEpoch.delete(epoch);
+        }
+        this.metrics?.shufflingCache.cancelledPromises.inc({ reason });
+        this.logger?.debug("Cancelled shuffling promise", { epoch, decisionRoot, reason });
+    }
     getIndexedAttestation(epoch, decisionRoot, fork, attestation) {
         const shuffling = this.getShufflingOrThrow(epoch, decisionRoot);
         return getIndexedAttestation(shuffling, fork, attestation);
@@ -142,6 +160,10 @@ export class ShufflingCache {
     getBeaconCommittee(epoch, decisionRoot, slot, index) {
         return this.getBeaconCommittees(epoch, decisionRoot, slot, [index])[0];
     }
+    getBeaconCommitteeOrNull(epoch, decisionRoot, slot, index) {
+        const shuffling = this.getSync(epoch, decisionRoot);
+        return shuffling === null ? null : getBeaconCommittees(shuffling, slot, [index])[0];
+    }
     getBeaconCommittees(epoch, decisionRoot, slot, indices) {
         const shuffling = this.getShufflingOrThrow(epoch, decisionRoot);
         return getBeaconCommittees(shuffling, slot, indices);
@@ -177,8 +199,40 @@ export class ShufflingCache {
         }
         // set the shuffling
         shufflingAtEpoch.set(decisionRoot, { type: CacheItemType.shuffling, shuffling });
-        // prune the cache
-        pruneSetToMax(this.itemsByDecisionRootByEpoch, this.maxEpochs);
+        this.prune();
+    }
+    /**
+     * Keep the `maxEpochs` highest epochs, regardless of insertion order.
+     */
+    prune() {
+        const toDelete = this.itemsByDecisionRootByEpoch.size - this.maxEpochs;
+        if (toDelete <= 0) {
+            return;
+        }
+        const prunedEpochs = Array.from(this.itemsByDecisionRootByEpoch.keys())
+            .sort((a, b) => a - b)
+            .slice(0, toDelete);
+        let prunedShufflings = 0;
+        for (const epoch of prunedEpochs) {
+            for (const cacheItem of this.itemsByDecisionRootByEpoch.get(epoch)?.values() ?? []) {
+                if (isPromiseCacheItem(cacheItem)) {
+                    cacheItem.resolveFn(null);
+                    this.metrics?.shufflingCache.cancelledPromises.inc({ reason: ShufflingPromiseCancelReason.pruned });
+                }
+                else {
+                    prunedShufflings++;
+                }
+            }
+            this.itemsByDecisionRootByEpoch.delete(epoch);
+        }
+        this.metrics?.shufflingCache.prunedShufflings.inc(prunedShufflings);
+        this.logger?.verbose("Pruned shuffling cache", {
+            prunedEpochs: prunedEpochs.join(","),
+            prunedShufflings,
+            cachedEpochs: Array.from(this.itemsByDecisionRootByEpoch.keys())
+                .sort((a, b) => a - b)
+                .join(","),
+        });
     }
 }
 function isShufflingCacheItem(item) {

package/lib/chain/shufflingCache.js.map

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

package/lib/chain/validation/attesterSlashing.d.ts

@@ -1,6 +1,6 @@
-import { AttesterSlashing } from "@lodestar/types";
+import { AttesterSlashing, Domain } from "@lodestar/types";
 import { IBeaconChain } from "../index.js";
-export declare function validateApiAttesterSlashing(chain: IBeaconChain, attesterSlashing: AttesterSlashing): Promise<void>;
-export declare function validateGossipAttesterSlashing(chain: IBeaconChain, attesterSlashing: AttesterSlashing): Promise<void>;
-export declare function validateAttesterSlashing(chain: IBeaconChain, attesterSlashing: AttesterSlashing, prioritizeBls?: boolean): Promise<void>;
+export declare function validateApiAttesterSlashing(chain: IBeaconChain, attesterSlashing: AttesterSlashing): Promise<[Domain, Domain]>;
+export declare function validateGossipAttesterSlashing(chain: IBeaconChain, attesterSlashing: AttesterSlashing): Promise<[Domain, Domain]>;
+export declare function validateAttesterSlashing(chain: IBeaconChain, attesterSlashing: AttesterSlashing, prioritizeBls?: boolean): Promise<[Domain, Domain]>;
 //# sourceMappingURL=attesterSlashing.d.ts.map

package/lib/chain/validation/attesterSlashing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attesterSlashing.d.ts","sourceRoot":"","sources":["../../../src/chain/validation/attesterSlashing.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAEzC,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,YAAY,EACnB,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,wBAAsB,8BAA8B,CAClD,KAAK,EAAE,YAAY,EACnB,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,IAAI,CAAC,CAEf;AAED,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,YAAY,EACnB,gBAAgB,EAAE,gBAAgB,EAClC,aAAa,UAAQ,GACpB,OAAO,CAAC,IAAI,CAAC,CAuCf"}
+{"version":3,"file":"attesterSlashing.d.ts","sourceRoot":"","sources":["../../../src/chain/validation/attesterSlashing.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,gBAAgB,EAAE,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAEzD,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAGzC,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,YAAY,EACnB,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAG3B;AAED,wBAAsB,8BAA8B,CAClD,KAAK,EAAE,YAAY,EACnB,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAE3B;AAED,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,YAAY,EACnB,gBAAgB,EAAE,gBAAgB,EAClC,aAAa,UAAQ,GACpB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAyC3B"}

package/lib/chain/validation/attesterSlashing.js

@@ -1,5 +1,6 @@
 import { assertValidAttesterSlashing, getAttesterSlashableIndices, getAttesterSlashingSignatureSets, isSlashableValidator, } from "@lodestar/state-transition";
 import { AttesterSlashingError, AttesterSlashingErrorCode, GossipAction } from "../errors/index.js";
+import { getAttesterSlashingSignatureDomains } from "../opPools/utils.js";
 export async function validateApiAttesterSlashing(chain, attesterSlashing) {
     const prioritizeBls = true;
     return validateAttesterSlashing(chain, attesterSlashing, prioritizeBls);
@@ -38,10 +39,12 @@ export async function validateAttesterSlashing(chain, attesterSlashing, prioriti
         });
     }
     const signatureSets = getAttesterSlashingSignatureSets(chain.config, state.slot, attesterSlashing);
+    const verifiedDomains = getAttesterSlashingSignatureDomains(chain.config, state.slot, attesterSlashing);
     if (!(await chain.bls.verifySignatureSets(signatureSets, { batchable: true, priority: prioritizeBls }))) {
         throw new AttesterSlashingError(GossipAction.REJECT, {
             code: AttesterSlashingErrorCode.INVALID_SIGNATURE,
         });
     }
+    return verifiedDomains;
 }
 //# sourceMappingURL=attesterSlashing.js.map

package/lib/chain/validation/attesterSlashing.js.map

@@ -1 +1 @@
-{"version":3,"file":"attesterSlashing.js","sourceRoot":"","sources":["../../../src/chain/validation/attesterSlashing.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,2BAA2B,EAC3B,2BAA2B,EAC3B,gCAAgC,EAChC,oBAAoB,GACrB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAC,qBAAqB,EAAE,yBAAyB,EAAE,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAGlG,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,KAAmB,EACnB,gBAAkC;IAElC,MAAM,aAAa,GAAG,IAAI,CAAC;IAC3B,OAAO,wBAAwB,CAAC,KAAK,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAC;AAC1E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,KAAmB,EACnB,gBAAkC;IAElC,OAAO,wBAAwB,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,KAAmB,EACnB,gBAAkC,EAClC,aAAa,GAAG,KAAK;IAErB,qHAAqH;IACrH,uCAAuC;IACvC,iHAAiH;IACjH,+FAA+F;IAC/F,MAAM,mBAAmB,GAAG,2BAA2B,CAAC,gBAAgB,CAAC,CAAC;IAC1E,IAAI,KAAK,CAAC,MAAM,CAAC,uBAAuB,CAAC,mBAAmB,CAAC,EAAE,CAAC;QAC9D,MAAM,IAAI,qBAAqB,CAAC,YAAY,CAAC,MAAM,EAAE;YACnD,IAAI,EAAE,yBAAyB,CAAC,cAAc;SAC/C,CAAC,CAAC;IACL,CAAC;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC;IAEnC,mFAAmF;IACnF,IAAI,CAAC;QACH,mDAAmD;QACnD,2BAA2B,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,cAAc,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAC;IACvG,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,qBAAqB,CAAC,YAAY,CAAC,MAAM,EAAE;YACnD,IAAI,EAAE,yBAAyB,CAAC,OAAO;YACvC,KAAK,EAAE,CAAU;SAClB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC;IACjC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,oBAAoB,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC;QACxG,MAAM,IAAI,qBAAqB,CAAC,YAAY,CAAC,MAAM,EAAE;YACnD,IAAI,EAAE,yBAAyB,CAAC,OAAO;YACvC,KAAK,EAAE,KAAK,CAAC,8CAA8C,CAAC;SAC7D,CAAC,CAAC;IACL,CAAC;IAED,MAAM,aAAa,GAAG,gCAAgC,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IACnG,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,GAAG,CAAC,mBAAmB,CAAC,aAAa,EAAE,EAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAC,CAAC,CAAC,EAAE,CAAC;QACtG,MAAM,IAAI,qBAAqB,CAAC,YAAY,CAAC,MAAM,EAAE;YACnD,IAAI,EAAE,yBAAyB,CAAC,iBAAiB;SAClD,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
+{"version":3,"file":"attesterSlashing.js","sourceRoot":"","sources":["../../../src/chain/validation/attesterSlashing.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,2BAA2B,EAC3B,2BAA2B,EAC3B,gCAAgC,EAChC,oBAAoB,GACrB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAC,qBAAqB,EAAE,yBAAyB,EAAE,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAElG,OAAO,EAAC,mCAAmC,EAAC,MAAM,qBAAqB,CAAC;AAExE,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,KAAmB,EACnB,gBAAkC;IAElC,MAAM,aAAa,GAAG,IAAI,CAAC;IAC3B,OAAO,wBAAwB,CAAC,KAAK,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAC;AAC1E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,KAAmB,EACnB,gBAAkC;IAElC,OAAO,wBAAwB,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,KAAmB,EACnB,gBAAkC,EAClC,aAAa,GAAG,KAAK;IAErB,qHAAqH;IACrH,uCAAuC;IACvC,iHAAiH;IACjH,+FAA+F;IAC/F,MAAM,mBAAmB,GAAG,2BAA2B,CAAC,gBAAgB,CAAC,CAAC;IAC1E,IAAI,KAAK,CAAC,MAAM,CAAC,uBAAuB,CAAC,mBAAmB,CAAC,EAAE,CAAC;QAC9D,MAAM,IAAI,qBAAqB,CAAC,YAAY,CAAC,MAAM,EAAE;YACnD,IAAI,EAAE,yBAAyB,CAAC,cAAc;SAC/C,CAAC,CAAC;IACL,CAAC;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC;IAEnC,mFAAmF;IACnF,IAAI,CAAC;QACH,mDAAmD;QACnD,2BAA2B,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,cAAc,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAC;IACvG,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,qBAAqB,CAAC,YAAY,CAAC,MAAM,EAAE;YACnD,IAAI,EAAE,yBAAyB,CAAC,OAAO;YACvC,KAAK,EAAE,CAAU;SAClB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC;IACjC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,oBAAoB,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC;QACxG,MAAM,IAAI,qBAAqB,CAAC,YAAY,CAAC,MAAM,EAAE;YACnD,IAAI,EAAE,yBAAyB,CAAC,OAAO;YACvC,KAAK,EAAE,KAAK,CAAC,8CAA8C,CAAC;SAC7D,CAAC,CAAC;IACL,CAAC;IAED,MAAM,aAAa,GAAG,gCAAgC,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IACnG,MAAM,eAAe,GAAG,mCAAmC,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IACxG,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,GAAG,CAAC,mBAAmB,CAAC,aAAa,EAAE,EAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAC,CAAC,CAAC,EAAE,CAAC;QACtG,MAAM,IAAI,qBAAqB,CAAC,YAAY,CAAC,MAAM,EAAE;YACnD,IAAI,EAAE,yBAAyB,CAAC,iBAAiB;SAClD,CAAC,CAAC;IACL,CAAC;IACD,OAAO,eAAe,CAAC;AACzB,CAAC"}

package/lib/chain/validation/proposerSlashing.d.ts

@@ -1,5 +1,5 @@
-import { phase0 } from "@lodestar/types";
+import { Domain, phase0 } from "@lodestar/types";
 import { IBeaconChain } from "../index.js";
-export declare function validateApiProposerSlashing(chain: IBeaconChain, proposerSlashing: phase0.ProposerSlashing): Promise<void>;
-export declare function validateGossipProposerSlashing(chain: IBeaconChain, proposerSlashing: phase0.ProposerSlashing): Promise<void>;
+export declare function validateApiProposerSlashing(chain: IBeaconChain, proposerSlashing: phase0.ProposerSlashing): Promise<Domain>;
+export declare function validateGossipProposerSlashing(chain: IBeaconChain, proposerSlashing: phase0.ProposerSlashing): Promise<Domain>;
 //# sourceMappingURL=proposerSlashing.d.ts.map

package/lib/chain/validation/proposerSlashing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proposerSlashing.d.ts","sourceRoot":"","sources":["../../../src/chain/validation/proposerSlashing.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAEvC,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAEzC,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,YAAY,EACnB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,GACxC,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,wBAAsB,8BAA8B,CAClD,KAAK,EAAE,YAAY,EACnB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,GACxC,OAAO,CAAC,IAAI,CAAC,CAEf"}
+{"version":3,"file":"proposerSlashing.d.ts","sourceRoot":"","sources":["../../../src/chain/validation/proposerSlashing.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAE,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAGzC,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,YAAY,EACnB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,GACxC,OAAO,CAAC,MAAM,CAAC,CAGjB;AAED,wBAAsB,8BAA8B,CAClD,KAAK,EAAE,YAAY,EACnB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,GACxC,OAAO,CAAC,MAAM,CAAC,CAEjB"}

package/lib/chain/validation/proposerSlashing.js

@@ -1,5 +1,6 @@
 import { assertValidProposerSlashing, getProposerSlashingSignatureSets } from "@lodestar/state-transition";
 import { GossipAction, ProposerSlashingError, ProposerSlashingErrorCode } from "../errors/index.js";
+import { getProposerSlashingSignatureDomain } from "../opPools/utils.js";
 export async function validateApiProposerSlashing(chain, proposerSlashing) {
     const prioritizeBls = true;
     return validateProposerSlashing(chain, proposerSlashing, prioritizeBls);
@@ -29,10 +30,12 @@ async function validateProposerSlashing(chain, proposerSlashing, prioritizeBls =
         });
     }
     const signatureSets = getProposerSlashingSignatureSets(chain.config, state.slot, proposerSlashing);
+    const verifiedDomain = getProposerSlashingSignatureDomain(chain.config, state.slot, proposerSlashing);
     if (!(await chain.bls.verifySignatureSets(signatureSets, { batchable: true, priority: prioritizeBls }))) {
         throw new ProposerSlashingError(GossipAction.REJECT, {
             code: ProposerSlashingErrorCode.INVALID_SIGNATURE,
         });
     }
+    return verifiedDomain;
 }
 //# sourceMappingURL=proposerSlashing.js.map

package/lib/chain/validation/proposerSlashing.js.map

@@ -1 +1 @@
-{"version":3,"file":"proposerSlashing.js","sourceRoot":"","sources":["../../../src/chain/validation/proposerSlashing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,2BAA2B,EAAE,gCAAgC,EAAC,MAAM,4BAA4B,CAAC;AAEzG,OAAO,EAAC,YAAY,EAAE,qBAAqB,EAAE,yBAAyB,EAAC,MAAM,oBAAoB,CAAC;AAGlG,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,KAAmB,EACnB,gBAAyC;IAEzC,MAAM,aAAa,GAAG,IAAI,CAAC;IAC3B,OAAO,wBAAwB,CAAC,KAAK,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAC;AAC1E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,KAAmB,EACnB,gBAAyC;IAEzC,OAAO,wBAAwB,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;AAC3D,CAAC;AAED,KAAK,UAAU,wBAAwB,CACrC,KAAmB,EACnB,gBAAyC,EACzC,aAAa,GAAG,KAAK;IAErB,2GAA2G;IAC3G,4DAA4D;IAC5D,IAAI,KAAK,CAAC,MAAM,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;QAC/F,MAAM,IAAI,qBAAqB,CAAC,YAAY,CAAC,MAAM,EAAE;YACnD,IAAI,EAAE,yBAAyB,CAAC,cAAc;SAC/C,CAAC,CAAC;IACL,CAAC;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC;IAEnC,mFAAmF;IACnF,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,KAAK,CAAC,YAAY,CAAC,gBAAgB,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC1F,mDAAmD;QACnD,2BAA2B,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC3F,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,qBAAqB,CAAC,YAAY,CAAC,MAAM,EAAE;YACnD,IAAI,EAAE,yBAAyB,CAAC,OAAO;YACvC,KAAK,EAAE,CAAU;SAClB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,aAAa,GAAG,gCAAgC,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IACnG,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,GAAG,CAAC,mBAAmB,CAAC,aAAa,EAAE,EAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAC,CAAC,CAAC,EAAE,CAAC;QACtG,MAAM,IAAI,qBAAqB,CAAC,YAAY,CAAC,MAAM,EAAE;YACnD,IAAI,EAAE,yBAAyB,CAAC,iBAAiB;SAClD,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
+{"version":3,"file":"proposerSlashing.js","sourceRoot":"","sources":["../../../src/chain/validation/proposerSlashing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,2BAA2B,EAAE,gCAAgC,EAAC,MAAM,4BAA4B,CAAC;AAEzG,OAAO,EAAC,YAAY,EAAE,qBAAqB,EAAE,yBAAyB,EAAC,MAAM,oBAAoB,CAAC;AAElG,OAAO,EAAC,kCAAkC,EAAC,MAAM,qBAAqB,CAAC;AAEvE,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,KAAmB,EACnB,gBAAyC;IAEzC,MAAM,aAAa,GAAG,IAAI,CAAC;IAC3B,OAAO,wBAAwB,CAAC,KAAK,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAC;AAC1E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,KAAmB,EACnB,gBAAyC;IAEzC,OAAO,wBAAwB,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;AAC3D,CAAC;AAED,KAAK,UAAU,wBAAwB,CACrC,KAAmB,EACnB,gBAAyC,EACzC,aAAa,GAAG,KAAK;IAErB,2GAA2G;IAC3G,4DAA4D;IAC5D,IAAI,KAAK,CAAC,MAAM,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;QAC/F,MAAM,IAAI,qBAAqB,CAAC,YAAY,CAAC,MAAM,EAAE;YACnD,IAAI,EAAE,yBAAyB,CAAC,cAAc;SAC/C,CAAC,CAAC;IACL,CAAC;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC;IAEnC,mFAAmF;IACnF,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,KAAK,CAAC,YAAY,CAAC,gBAAgB,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC1F,mDAAmD;QACnD,2BAA2B,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC3F,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,qBAAqB,CAAC,YAAY,CAAC,MAAM,EAAE;YACnD,IAAI,EAAE,yBAAyB,CAAC,OAAO;YACvC,KAAK,EAAE,CAAU;SAClB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,aAAa,GAAG,gCAAgC,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IACnG,MAAM,cAAc,GAAG,kCAAkC,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IACtG,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,GAAG,CAAC,mBAAmB,CAAC,aAAa,EAAE,EAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAC,CAAC,CAAC,EAAE,CAAC;QACtG,MAAM,IAAI,qBAAqB,CAAC,YAAY,CAAC,MAAM,EAAE;YACnD,IAAI,EAAE,yBAAyB,CAAC,iBAAiB;SAClD,CAAC,CAAC;IACL,CAAC;IACD,OAAO,cAAc,CAAC;AACxB,CAAC"}

package/lib/chain/validatorMonitor.d.ts

@@ -35,8 +35,12 @@ export type ValidatorMonitorOpts = {
     /** Log validator monitor events as info */
     validatorMonitorLogs?: boolean;
 };
+export type NativeValidatorMonitor = {
+    registerLocalValidator(index: ValidatorIndex): void;
+    unregisterLocalValidator(index: ValidatorIndex): void;
+};
 export declare const defaultValidatorMonitorOpts: ValidatorMonitorOpts;
-export declare function createValidatorMonitor(metricsRegister: RegistryMetricCreator | null, config: ChainForkConfig, genesisTime: number, logger: Logger, opts: ValidatorMonitorOpts): ValidatorMonitor;
+export declare function createValidatorMonitor(metricsRegister: RegistryMetricCreator | null, config: ChainForkConfig, genesisTime: number, logger: Logger, opts: ValidatorMonitorOpts, nativeValidatorMonitor?: NativeValidatorMonitor | null): ValidatorMonitor;
 /**
  * Cache to prevent accessing the state tree to fetch block roots repeteadly.
  * In normal network conditions the same root is read multiple times, specially the target.

package/lib/chain/validatorMonitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validatorMonitor.d.ts","sourceRoot":"","sources":["../../src/chain/validatorMonitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EACL,gBAAgB,EASjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,WAAW,EACX,KAAK,EACL,kBAAkB,EAClB,OAAO,EACP,uBAAuB,EACvB,IAAI,EACJ,QAAQ,EACR,cAAc,EACd,MAAM,EACN,KAAK,EACL,KAAK,EACN,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAIL,MAAM,EAMP,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAC,qBAAqB,EAAC,MAAM,qBAAqB,CAAC;AAgB1D,KAAK,OAAO,GAAG,MAAM,CAAC;AACtB,oBAAY,QAAQ;IAClB,GAAG,QAAQ;IACX,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,qCAAqC,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,GAAG,IAAI,CAAC;IAC9E,yBAAyB,CACvB,YAAY,EAAE,KAAK,EACnB,eAAe,EAAE,MAAM,EAAE,EACzB,KAAK,EAAE,MAAM,EAAE,EACf,iBAAiB,EAAE,OAAO,EAAE,EAC5B,iBAAiB,EAAE,OAAO,EAAE,EAC5B,QAAQ,CAAC,EAAE,MAAM,EAAE,GAClB,IAAI,CAAC;IACR,mBAAmB,CAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,GAAG,IAAI,CAAC;IAChF,mBAAmB,CAAC,GAAG,EAAE,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;IAC7F,gCAAgC,CAC9B,GAAG,EAAE,QAAQ,EACb,QAAQ,EAAE,OAAO,EACjB,QAAQ,EAAE,KAAK,CAAC,8BAA8B,GAC7C,IAAI,CAAC;IACR,2BAA2B,CAAC,GAAG,EAAE,QAAQ,EAAE,aAAa,EAAE,cAAc,EAAE,GAAG,EAAE,KAAK,CAAC,mBAAmB,GAAG,IAAI,CAAC;IAChH,qBAAqB,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE;QAAC,oBAAoB,EAAE,MAAM,CAAA;KAAC,GAAG,IAAI,CAAC;IACtF,mCAAmC,CACjC,gBAAgB,EAAE,MAAM,EACxB,kBAAkB,EAAE,kBAAkB,EACtC,MAAM,EAAE,QAAQ,EAChB,SAAS,EAAE,MAAM,GAChB,IAAI,CAAC;IACR,iCAAiC,CAC/B,gBAAgB,EAAE,MAAM,EACxB,kBAAkB,EAAE,kBAAkB,EACtC,SAAS,EAAE,MAAM,GAChB,IAAI,CAAC;IACR,qCAAqC,CAAC,gBAAgB,EAAE,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC/G,mCAAmC,CACjC,gBAAgB,EAAE,OAAO,EACzB,uBAAuB,EAAE,uBAAuB,EAChD,kBAAkB,EAAE,kBAAkB,GACrC,IAAI,CAAC;IACR,0BAA0B,CACxB,kBAAkB,EAAE,kBAAkB,EACtC,UAAU,EAAE,IAAI,EAChB,WAAW,EAAE,OAAO,EACpB,cAAc,EAAE,OAAO,EACvB,kBAAkB,EAAE,OAAO,EAC3B,kBAAkB,EAAE,IAAI,GACvB,IAAI,CAAC;IACR,sCAAsC,CACpC,wBAAwB,EAAE,MAAM,CAAC,oBAAoB,EACrD,+BAA+B,EAAE,cAAc,EAAE,GAChD,IAAI,CAAC;IACR,4BAA4B,CAC1B,KAAK,EAAE,KAAK,EACZ,aAAa,EAAE,MAAM,CAAC,aAAa,EACnC,oBAAoB,EAAE,WAAW,GAChC,IAAI,CAAC;IACR,mBAAmB,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACnD,aAAa,CAAC,SAAS,EAAE,IAAI,GAAG,IAAI,CAAC;IACrC,sEAAsE;IACtE,4BAA4B,IAAI,cAAc,EAAE,CAAC;CAClD,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,2CAA2C;IAC3C,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,oBAEzC,CAAC;AAsKF,wBAAgB,sBAAsB,CACpC,eAAe,EAAE,qBAAqB,GAAG,IAAI,EAC7C,MAAM,EAAE,eAAe,EACvB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,oBAAoB,GACzB,gBAAgB,CAymBlB;AAgQD;;;GAGG;AACH,qBAAa,YAAY;IAGX,OAAO,CAAC,QAAQ,CAAC,KAAK;IAFlC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAmC;IAEtE,YAA6B,KAAK,EAAE,gBAAgB,EAAI;IAExD;;;;;OAKG;IACH,kBAAkB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,GAAG,IAAI,CAU7C;CACF"}
+{"version":3,"file":"validatorMonitor.d.ts","sourceRoot":"","sources":["../../src/chain/validatorMonitor.ts"],"names":[],"mappings":"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"}

package/lib/chain/validatorMonitor.js

@@ -70,7 +70,7 @@ function getEpochSummary(validator, epoch) {
     }
     return summary;
 }
-export function createValidatorMonitor(metricsRegister, config, genesisTime, logger, opts) {
+export function createValidatorMonitor(metricsRegister, config, genesisTime, logger, opts, nativeValidatorMonitor = null) {
     const logLevel = opts.validatorMonitorLogs ? LogLevel.info : LogLevel.debug;
     const log = (message, context) => {
         logger[logLevel](message, context);
@@ -90,15 +90,20 @@ export function createValidatorMonitor(metricsRegister, config, genesisTime, log
         lastRegisteredTimeMs: 0,
     }));
     let lastRegisteredStatusEpoch = -1;
+    let lastAttestationSummaryEpoch = -1;
     // Track validator additions/removals per epoch for logging
     const addedValidatorsInEpoch = new Set();
     const removedValidatorsInEpoch = new Set();
-    const validatorMonitorMetrics = metricsRegister ? createValidatorMonitorMetrics(metricsRegister) : null;
+    const shouldRegisterStateDerivedMetrics = nativeValidatorMonitor === null;
+    const validatorMonitorMetrics = metricsRegister
+        ? createValidatorMonitorMetrics(metricsRegister, shouldRegisterStateDerivedMetrics)
+        : null;
     const validatorMonitor = {
         registerLocalValidator(index) {
             const isNewValidator = !validators.has(index);
             validators.getOrDefault(index).lastRegisteredTimeMs = Date.now();
             if (isNewValidator) {
+                nativeValidatorMonitor?.registerLocalValidator(index);
                 addedValidatorsInEpoch.add(index);
             }
         },
@@ -121,7 +126,7 @@ export function createValidatorMonitor(metricsRegister, config, genesisTime, log
             }
             // Track total balance instead of per-validator balance to reduce metric cardinality
             let totalBalance = 0;
-            for (const [index, monitoredValidator] of validators.entries()) {
+            for (const index of validators.keys()) {
                 // We subtract two from the state of the epoch that generated these summaries.
                 //
                 // - One to account for it being the previous epoch.
@@ -129,66 +134,30 @@ export function createValidatorMonitor(metricsRegister, config, genesisTime, log
                 //     statuses.
                 const summary = statusToSummary(inclusionDelays[index], flags[index], isActiveCurrEpoch[index], isActiveInPrevEpoch[index]);
                 if (summary.isPrevSourceAttester) {
-                    validatorMonitorMetrics?.prevEpochOnChainSourceAttesterHit.inc();
+                    validatorMonitorMetrics?.prevEpochOnChainSourceAttesterHit?.inc();
                 }
                 else {
-                    validatorMonitorMetrics?.prevEpochOnChainSourceAttesterMiss.inc();
+                    validatorMonitorMetrics?.prevEpochOnChainSourceAttesterMiss?.inc();
                 }
                 if (summary.isPrevHeadAttester) {
-                    validatorMonitorMetrics?.prevEpochOnChainHeadAttesterHit.inc();
+                    validatorMonitorMetrics?.prevEpochOnChainHeadAttesterHit?.inc();
                 }
                 else {
-                    validatorMonitorMetrics?.prevEpochOnChainHeadAttesterMiss.inc();
+                    validatorMonitorMetrics?.prevEpochOnChainHeadAttesterMiss?.inc();
                 }
                 if (summary.isPrevTargetAttester) {
-                    validatorMonitorMetrics?.prevEpochOnChainTargetAttesterHit.inc();
+                    validatorMonitorMetrics?.prevEpochOnChainTargetAttesterHit?.inc();
                 }
                 else {
-                    validatorMonitorMetrics?.prevEpochOnChainTargetAttesterMiss.inc();
-                }
-                const prevEpochSummary = monitoredValidator.summaries.get(previousEpoch);
-                const attestationCorrectHead = prevEpochSummary?.attestationCorrectHead;
-                if (attestationCorrectHead !== null && attestationCorrectHead !== undefined) {
-                    if (attestationCorrectHead) {
-                        validatorMonitorMetrics?.prevOnChainAttesterCorrectHead.inc();
-                    }
-                    else {
-                        validatorMonitorMetrics?.prevOnChainAttesterIncorrectHead.inc();
-                    }
-                }
-                const attestationMinBlockInclusionDistance = prevEpochSummary?.attestationMinBlockInclusionDistance;
-                const inclusionDistance = attestationMinBlockInclusionDistance != null && attestationMinBlockInclusionDistance > 0
-                    ? // altair, attestation is not missed
-                        attestationMinBlockInclusionDistance
-                    : summary.inclusionDistance
-                        ? // phase0, this is from the state transition
-                            summary.inclusionDistance
-                        : null;
-                if (inclusionDistance !== null) {
-                    validatorMonitorMetrics?.prevEpochOnChainInclusionDistance.observe(inclusionDistance);
-                    validatorMonitorMetrics?.prevEpochOnChainAttesterHit.inc();
-                }
-                else {
-                    validatorMonitorMetrics?.prevEpochOnChainAttesterMiss.inc();
+                    validatorMonitorMetrics?.prevEpochOnChainTargetAttesterMiss?.inc();
                 }
                 const balance = balances?.[index];
                 if (balance !== undefined) {
                     totalBalance += balance;
                 }
-                if (!summary.isPrevSourceAttester || !summary.isPrevTargetAttester || !summary.isPrevHeadAttester) {
-                    log("Failed attestation in previous epoch", {
-                        validator: index,
-                        prevEpoch: currentEpoch - 1,
-                        isPrevSourceAttester: summary.isPrevSourceAttester,
-                        isPrevHeadAttester: summary.isPrevHeadAttester,
-                        isPrevTargetAttester: summary.isPrevTargetAttester,
-                        // inclusionDistance is not available in summary since altair
-                        inclusionDistance,
-                    });
-                }
             }
             if (balances !== undefined) {
-                validatorMonitorMetrics?.prevEpochOnChainBalance.set(totalBalance);
+                validatorMonitorMetrics?.prevEpochOnChainBalance?.set(totalBalance);
             }
         },
         registerBeaconBlock(src, delaySec, block) {
@@ -436,6 +405,7 @@ export function createValidatorMonitor(metricsRegister, config, genesisTime, log
             // Prune validators not seen in a while
             for (const [index, validator] of validators.entries()) {
                 if (Date.now() - validator.lastRegisteredTimeMs > retainRegisteredValidatorsMs) {
+                    nativeValidatorMonitor?.unregisterLocalValidator(index);
                     validators.delete(index);
                     removedValidatorsInEpoch.add(index);
                 }
@@ -464,6 +434,35 @@ export function createValidatorMonitor(metricsRegister, config, genesisTime, log
             if (validators.size === 0) {
                 return;
             }
+            // On-chain attestation summary of prevEpoch. Reads only the epoch summaries filled by
+            // registerAttestationInBlock(), so it works with both TS and native state transition.
+            if (prevEpoch > lastAttestationSummaryEpoch) {
+                lastAttestationSummaryEpoch = prevEpoch;
+                for (const monitoredValidator of validators.values()) {
+                    const prevEpochSummary = monitoredValidator.summaries.get(prevEpoch);
+                    const attestationCorrectHead = prevEpochSummary?.attestationCorrectHead;
+                    if (attestationCorrectHead !== null && attestationCorrectHead !== undefined) {
+                        if (attestationCorrectHead) {
+                            validatorMonitorMetrics?.prevOnChainAttesterCorrectHead.inc();
+                        }
+                        else {
+                            validatorMonitorMetrics?.prevOnChainAttesterIncorrectHead.inc();
+                        }
+                    }
+                    const attestationMinBlockInclusionDistance = prevEpochSummary?.attestationMinBlockInclusionDistance;
+                    const inclusionDistance = attestationMinBlockInclusionDistance != null && attestationMinBlockInclusionDistance > 0
+                        ? // altair, attestation is not missed
+                            attestationMinBlockInclusionDistance
+                        : null;
+                    if (inclusionDistance !== null) {
+                        validatorMonitorMetrics?.prevEpochOnChainInclusionDistance.observe(inclusionDistance);
+                        validatorMonitorMetrics?.prevEpochOnChainAttesterHit.inc();
+                    }
+                    else {
+                        validatorMonitorMetrics?.prevEpochOnChainAttesterMiss.inc();
+                    }
+                }
+            }
             const rootCache = new RootHexCache(headState);
             if (isStatePostAltair(headState)) {
                 const prevEpochStartSlot = computeStartSlotAtEpoch(prevEpoch);
@@ -479,6 +478,16 @@ export function createValidatorMonitor(metricsRegister, config, genesisTime, log
                         epoch: prevEpoch,
                         summary,
                     });
+                    if (!flags.timelySource || !flags.timelyTarget || !flags.timelyHead) {
+                        log("Failed attestation in previous epoch", {
+                            validator: index,
+                            prevEpoch,
+                            isPrevSourceAttester: flags.timelySource,
+                            isPrevHeadAttester: flags.timelyHead,
+                            isPrevTargetAttester: flags.timelyTarget,
+                            inclusionDistance: validator.summaries.get(prevEpoch)?.attestationMinBlockInclusionDistance ?? null,
+                        });
+                    }
                 }
             }
             if (headState.previousProposers !== null) {
@@ -813,7 +822,8 @@ export class RootHexCache {
         return root;
     }
 }
-function createValidatorMonitorMetrics(register) {
+function createValidatorMonitorMetrics(register, registerStateDerivedMetrics = true) {
+    const stateDerivedRegister = registerStateDerivedMetrics ? register : null;
     return {
         validatorsConnected: register.gauge({
             name: "validator_monitor_validators",
@@ -829,7 +839,7 @@ function createValidatorMonitorMetrics(register) {
             help: "Count of validators monitored by this beacon node that are part of sync committee",
         }),
         // Validator Monitor Metrics (per-epoch summaries)
-        prevEpochOnChainBalance: register.gauge({
+        prevEpochOnChainBalance: stateDerivedRegister?.gauge({
             name: "validator_monitor_prev_epoch_on_chain_balance",
             help: "Total balance of all monitored validators after an epoch",
         }),
@@ -841,19 +851,19 @@ function createValidatorMonitorMetrics(register) {
             name: "validator_monitor_prev_epoch_on_chain_attester_miss_total",
             help: "Incremented if validator's submitted attestation is not included in any blocks",
         }),
-        prevEpochOnChainSourceAttesterHit: register.gauge({
+        prevEpochOnChainSourceAttesterHit: stateDerivedRegister?.gauge({
             name: "validator_monitor_prev_epoch_on_chain_source_attester_hit_total",
             help: "Incremented if the validator is flagged as a previous epoch source attester during per epoch processing",
         }),
-        prevEpochOnChainSourceAttesterMiss: register.gauge({
+        prevEpochOnChainSourceAttesterMiss: stateDerivedRegister?.gauge({
             name: "validator_monitor_prev_epoch_on_chain_source_attester_miss_total",
             help: "Incremented if the validator is not flagged as a previous epoch source attester during per epoch processing",
         }),
-        prevEpochOnChainHeadAttesterHit: register.gauge({
+        prevEpochOnChainHeadAttesterHit: stateDerivedRegister?.gauge({
             name: "validator_monitor_prev_epoch_on_chain_head_attester_hit_total",
             help: "Incremented if the validator is flagged as a previous epoch head attester during per epoch processing",
         }),
-        prevEpochOnChainHeadAttesterMiss: register.gauge({
+        prevEpochOnChainHeadAttesterMiss: stateDerivedRegister?.gauge({
             name: "validator_monitor_prev_epoch_on_chain_head_attester_miss_total",
             help: "Incremented if the validator is not flagged as a previous epoch head attester during per epoch processing",
         }),
@@ -865,11 +875,11 @@ function createValidatorMonitorMetrics(register) {
             name: "validator_monitor_prev_epoch_on_chain_attester_incorrect_head_total",
             help: "Total count of times a validator votes incorrect head",
         }),
-        prevEpochOnChainTargetAttesterHit: register.gauge({
+        prevEpochOnChainTargetAttesterHit: stateDerivedRegister?.gauge({
             name: "validator_monitor_prev_epoch_on_chain_target_attester_hit_total",
             help: "Incremented if the validator is flagged as a previous epoch target attester during per epoch processing",
         }),
-        prevEpochOnChainTargetAttesterMiss: register.gauge({
+        prevEpochOnChainTargetAttesterMiss: stateDerivedRegister?.gauge({
             name: "validator_monitor_prev_epoch_on_chain_target_attester_miss_total",
             help: "Incremented if the validator is not flagged as a previous epoch target attester during per epoch processing",
         }),