@lodestar/beacon-node 1.50.0-dev.d99080f29a → 1.50.0-dev.dff4197219
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/api/impl/beacon/index.d.ts.map +1 -1
- package/lib/api/impl/beacon/index.js +13 -0
- package/lib/api/impl/beacon/index.js.map +1 -1
- package/lib/api/impl/beacon/state/index.d.ts.map +1 -1
- package/lib/api/impl/beacon/state/index.js +28 -6
- package/lib/api/impl/beacon/state/index.js.map +1 -1
- package/lib/api/impl/debug/index.d.ts.map +1 -1
- package/lib/api/impl/debug/index.js +26 -18
- package/lib/api/impl/debug/index.js.map +1 -1
- package/lib/api/impl/validator/index.d.ts +1 -0
- package/lib/api/impl/validator/index.d.ts.map +1 -1
- package/lib/api/impl/validator/index.js +23 -1
- package/lib/api/impl/validator/index.js.map +1 -1
- package/lib/chain/archiveStore/archiveStore.d.ts +5 -0
- package/lib/chain/archiveStore/archiveStore.d.ts.map +1 -1
- package/lib/chain/archiveStore/archiveStore.js +14 -24
- package/lib/chain/archiveStore/archiveStore.js.map +1 -1
- package/lib/chain/archiveStore/historicalState/getHistoricalState.d.ts +2 -2
- package/lib/chain/archiveStore/historicalState/getHistoricalState.d.ts.map +1 -1
- package/lib/chain/archiveStore/historicalState/getHistoricalState.js +5 -7
- package/lib/chain/archiveStore/historicalState/getHistoricalState.js.map +1 -1
- package/lib/chain/archiveStore/historicalState/historicalStateRegen.js +1 -1
- package/lib/chain/archiveStore/historicalState/historicalStateRegen.js.map +1 -1
- package/lib/chain/archiveStore/historicalState/types.d.ts +2 -2
- package/lib/chain/archiveStore/historicalState/types.d.ts.map +1 -1
- package/lib/chain/archiveStore/historicalState/worker.js +1 -1
- package/lib/chain/archiveStore/historicalState/worker.js.map +1 -1
- package/lib/chain/archiveStore/interface.d.ts +1 -1
- package/lib/chain/archiveStore/interface.d.ts.map +1 -1
- package/lib/chain/archiveStore/utils/pruneHistory.d.ts +1 -1
- package/lib/chain/archiveStore/utils/pruneHistory.d.ts.map +1 -1
- package/lib/chain/archiveStore/utils/pruneHistory.js +2 -1
- package/lib/chain/archiveStore/utils/pruneHistory.js.map +1 -1
- package/lib/chain/blocks/importBlock.d.ts.map +1 -1
- package/lib/chain/blocks/importBlock.js +13 -6
- package/lib/chain/blocks/importBlock.js.map +1 -1
- package/lib/chain/blocks/verifyBlock.d.ts.map +1 -1
- package/lib/chain/blocks/verifyBlock.js +7 -7
- package/lib/chain/blocks/verifyBlock.js.map +1 -1
- package/lib/chain/blocks/verifyBlocksStateTransitionOnly.d.ts +2 -1
- package/lib/chain/blocks/verifyBlocksStateTransitionOnly.d.ts.map +1 -1
- package/lib/chain/blocks/verifyBlocksStateTransitionOnly.js +5 -4
- package/lib/chain/blocks/verifyBlocksStateTransitionOnly.js.map +1 -1
- package/lib/chain/chain.d.ts +4 -1
- package/lib/chain/chain.d.ts.map +1 -1
- package/lib/chain/chain.js +76 -20
- package/lib/chain/chain.js.map +1 -1
- package/lib/chain/emitter.d.ts +7 -1
- package/lib/chain/emitter.d.ts.map +1 -1
- package/lib/chain/emitter.js +5 -0
- package/lib/chain/emitter.js.map +1 -1
- package/lib/chain/forkChoice/index.d.ts.map +1 -1
- package/lib/chain/forkChoice/index.js +2 -0
- package/lib/chain/forkChoice/index.js.map +1 -1
- package/lib/chain/interface.d.ts +1 -0
- package/lib/chain/interface.d.ts.map +1 -1
- package/lib/chain/opPools/aggregatedAttestationPool.d.ts +4 -2
- package/lib/chain/opPools/aggregatedAttestationPool.d.ts.map +1 -1
- package/lib/chain/opPools/aggregatedAttestationPool.js +30 -8
- package/lib/chain/opPools/aggregatedAttestationPool.js.map +1 -1
- package/lib/chain/opPools/proposerPreferencesPool.d.ts +4 -4
- package/lib/chain/opPools/proposerPreferencesPool.d.ts.map +1 -1
- package/lib/chain/opPools/proposerPreferencesPool.js +14 -11
- package/lib/chain/opPools/proposerPreferencesPool.js.map +1 -1
- package/lib/chain/options.d.ts +2 -1
- package/lib/chain/options.d.ts.map +1 -1
- package/lib/chain/options.js +1 -1
- package/lib/chain/options.js.map +1 -1
- package/lib/chain/produceBlock/computeNewStateRoot.js +1 -1
- package/lib/chain/produceBlock/computeNewStateRoot.js.map +1 -1
- package/lib/chain/regen/regen.d.ts +2 -0
- package/lib/chain/regen/regen.d.ts.map +1 -1
- package/lib/chain/regen/regen.js +10 -4
- package/lib/chain/regen/regen.js.map +1 -1
- package/lib/chain/seenCache/seenGossipBlockInput.d.ts +7 -0
- package/lib/chain/seenCache/seenGossipBlockInput.d.ts.map +1 -1
- package/lib/chain/seenCache/seenGossipBlockInput.js +21 -0
- package/lib/chain/seenCache/seenGossipBlockInput.js.map +1 -1
- package/lib/chain/shufflingCache.d.ts +18 -8
- package/lib/chain/shufflingCache.d.ts.map +1 -1
- package/lib/chain/shufflingCache.js +72 -18
- package/lib/chain/shufflingCache.js.map +1 -1
- package/lib/chain/validatorMonitor.d.ts +5 -1
- package/lib/chain/validatorMonitor.d.ts.map +1 -1
- package/lib/chain/validatorMonitor.js +64 -54
- package/lib/chain/validatorMonitor.js.map +1 -1
- package/lib/db/beacon.d.ts +2 -0
- package/lib/db/beacon.d.ts.map +1 -1
- package/lib/db/beacon.js +3 -0
- package/lib/db/beacon.js.map +1 -1
- package/lib/db/buckets.d.ts +2 -1
- package/lib/db/buckets.d.ts.map +1 -1
- package/lib/db/buckets.js +1 -0
- package/lib/db/buckets.js.map +1 -1
- package/lib/db/interface.d.ts +2 -0
- package/lib/db/interface.d.ts.map +1 -1
- package/lib/db/repositories/blockArchiveIndex.d.ts +2 -2
- package/lib/db/repositories/blockArchiveIndex.d.ts.map +1 -1
- package/lib/db/repositories/earliestAvailableSlot.d.ts +11 -0
- package/lib/db/repositories/earliestAvailableSlot.d.ts.map +1 -0
- package/lib/db/repositories/earliestAvailableSlot.js +19 -0
- package/lib/db/repositories/earliestAvailableSlot.js.map +1 -0
- package/lib/execution/engine/disabled.d.ts +0 -2
- package/lib/execution/engine/disabled.d.ts.map +1 -1
- package/lib/execution/engine/disabled.js +0 -6
- package/lib/execution/engine/disabled.js.map +1 -1
- package/lib/execution/engine/http.d.ts +1 -3
- package/lib/execution/engine/http.d.ts.map +1 -1
- package/lib/execution/engine/http.js +2 -17
- package/lib/execution/engine/http.js.map +1 -1
- package/lib/execution/engine/interface.d.ts +2 -4
- package/lib/execution/engine/interface.d.ts.map +1 -1
- package/lib/execution/engine/mock.d.ts +0 -2
- package/lib/execution/engine/mock.d.ts.map +1 -1
- package/lib/execution/engine/mock.js +0 -8
- package/lib/execution/engine/mock.js.map +1 -1
- package/lib/execution/engine/types.d.ts +0 -8
- package/lib/execution/engine/types.d.ts.map +1 -1
- package/lib/execution/engine/types.js.map +1 -1
- package/lib/metrics/metrics/lodestar.d.ts +7 -0
- package/lib/metrics/metrics/lodestar.d.ts.map +1 -1
- package/lib/metrics/metrics/lodestar.js +17 -0
- package/lib/metrics/metrics/lodestar.js.map +1 -1
- package/lib/metrics/metrics.d.ts +7 -3
- package/lib/metrics/metrics.d.ts.map +1 -1
- package/lib/metrics/metrics.js +4 -4
- package/lib/metrics/metrics.js.map +1 -1
- package/lib/network/processor/gossipHandlers.d.ts.map +1 -1
- package/lib/network/processor/gossipHandlers.js +59 -63
- package/lib/network/processor/gossipHandlers.js.map +1 -1
- package/lib/node/nodejs.d.ts +3 -1
- package/lib/node/nodejs.d.ts.map +1 -1
- package/lib/node/nodejs.js +27 -4
- package/lib/node/nodejs.js.map +1 -1
- package/lib/sync/range/batch.d.ts +11 -5
- package/lib/sync/range/batch.d.ts.map +1 -1
- package/lib/sync/range/batch.js +21 -17
- package/lib/sync/range/batch.js.map +1 -1
- package/lib/sync/range/chain.d.ts +4 -4
- package/lib/sync/range/chain.d.ts.map +1 -1
- package/lib/sync/range/chain.js +12 -6
- package/lib/sync/range/chain.js.map +1 -1
- package/lib/sync/range/range.d.ts.map +1 -1
- package/lib/sync/range/range.js +25 -11
- package/lib/sync/range/range.js.map +1 -1
- package/lib/sync/unknownBlock.d.ts +5 -2
- package/lib/sync/unknownBlock.d.ts.map +1 -1
- package/lib/sync/unknownBlock.js +44 -20
- package/lib/sync/unknownBlock.js.map +1 -1
- package/lib/sync/utils/downloadByRange.d.ts +38 -14
- package/lib/sync/utils/downloadByRange.d.ts.map +1 -1
- package/lib/sync/utils/downloadByRange.js +84 -39
- package/lib/sync/utils/downloadByRange.js.map +1 -1
- package/package.json +17 -17
- package/src/api/impl/beacon/index.ts +15 -0
- package/src/api/impl/beacon/state/index.ts +43 -6
- package/src/api/impl/debug/index.ts +28 -19
- package/src/api/impl/validator/index.ts +24 -2
- package/src/chain/archiveStore/archiveStore.ts +19 -25
- package/src/chain/archiveStore/historicalState/getHistoricalState.ts +5 -7
- package/src/chain/archiveStore/historicalState/historicalStateRegen.ts +1 -1
- package/src/chain/archiveStore/historicalState/types.ts +2 -2
- package/src/chain/archiveStore/historicalState/worker.ts +1 -2
- package/src/chain/archiveStore/interface.ts +1 -1
- package/src/chain/archiveStore/utils/pruneHistory.ts +4 -1
- package/src/chain/blocks/importBlock.ts +16 -5
- package/src/chain/blocks/verifyBlock.ts +8 -6
- package/src/chain/blocks/verifyBlocksStateTransitionOnly.ts +6 -3
- package/src/chain/chain.ts +101 -19
- package/src/chain/emitter.ts +7 -1
- package/src/chain/forkChoice/index.ts +2 -0
- package/src/chain/interface.ts +1 -0
- package/src/chain/opPools/aggregatedAttestationPool.ts +34 -10
- package/src/chain/opPools/proposerPreferencesPool.ts +14 -10
- package/src/chain/options.ts +3 -3
- package/src/chain/produceBlock/computeNewStateRoot.ts +1 -1
- package/src/chain/regen/regen.ts +12 -4
- package/src/chain/seenCache/seenGossipBlockInput.ts +23 -0
- package/src/chain/shufflingCache.ts +84 -22
- package/src/chain/validatorMonitor.ts +75 -57
- package/src/db/beacon.ts +3 -0
- package/src/db/buckets.ts +1 -0
- package/src/db/interface.ts +2 -0
- package/src/db/repositories/earliestAvailableSlot.ts +19 -0
- package/src/execution/engine/disabled.ts +0 -8
- package/src/execution/engine/http.ts +1 -30
- package/src/execution/engine/interface.ts +2 -6
- package/src/execution/engine/mock.ts +1 -19
- package/src/execution/engine/types.ts +0 -10
- package/src/metrics/metrics/lodestar.ts +18 -0
- package/src/metrics/metrics.ts +21 -6
- package/src/network/processor/gossipHandlers.ts +90 -76
- package/src/node/nodejs.ts +35 -3
- package/src/sync/range/batch.ts +25 -19
- package/src/sync/range/chain.ts +15 -8
- package/src/sync/range/range.ts +26 -12
- package/src/sync/unknownBlock.ts +57 -21
- package/src/sync/utils/downloadByRange.ts +123 -58
|
@@ -60,6 +60,9 @@ export class SeenBlockInput {
|
|
|
60
60
|
// there should only 1 block root per slot but we need to always compare against rootHex
|
|
61
61
|
// and the signature to ensure we only skip verification if both match
|
|
62
62
|
verifiedProposerSignatures = new Map();
|
|
63
|
+
// Roots of gossip blocks under validation, counted because blocks with the same root but different signatures
|
|
64
|
+
// can be validated concurrently
|
|
65
|
+
validatingBlockRoots = new Map();
|
|
63
66
|
constructor({ config, custodyConfig, clock, chainEvents, signal, serializedCache, metrics, logger, }) {
|
|
64
67
|
this.config = config;
|
|
65
68
|
this.custodyConfig = custodyConfig;
|
|
@@ -83,6 +86,24 @@ export class SeenBlockInput {
|
|
|
83
86
|
hasBlock(rootHex) {
|
|
84
87
|
return this.blockInputs.get(rootHex)?.hasBlock() ?? false;
|
|
85
88
|
}
|
|
89
|
+
/**
|
|
90
|
+
* Mark a gossip block root as under validation, every call MUST be paired with `unmarkValidatingBlock()`
|
|
91
|
+
*/
|
|
92
|
+
markValidatingBlock(rootHex) {
|
|
93
|
+
this.validatingBlockRoots.set(rootHex, (this.validatingBlockRoots.get(rootHex) ?? 0) + 1);
|
|
94
|
+
}
|
|
95
|
+
unmarkValidatingBlock(rootHex) {
|
|
96
|
+
const count = this.validatingBlockRoots.get(rootHex) ?? 0;
|
|
97
|
+
if (count <= 1) {
|
|
98
|
+
this.validatingBlockRoots.delete(rootHex);
|
|
99
|
+
}
|
|
100
|
+
else {
|
|
101
|
+
this.validatingBlockRoots.set(rootHex, count - 1);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
isValidatingBlock(rootHex) {
|
|
105
|
+
return this.validatingBlockRoots.has(rootHex);
|
|
106
|
+
}
|
|
86
107
|
get(rootHex) {
|
|
87
108
|
return this.blockInputs.get(rootHex);
|
|
88
109
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seenGossipBlockInput.js","sourceRoot":"","sources":["../../../src/chain/seenCache/seenGossipBlockInput.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"seenGossipBlockInput.js","sourceRoot":"","sources":["../../../src/chain/seenCache/seenGossipBlockInput.ts"],"names":[],"mappings":"AAEA,OAAO,EAKL,eAAe,EACf,eAAe,EACf,cAAc,EACd,eAAe,GAChB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,uBAAuB,EAAC,MAAM,4BAA4B,CAAC;AAEnE,OAAO,EAAC,aAAa,EAAU,eAAe,EAAE,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAEtF,OAAO,EAAC,qBAAqB,EAAC,MAAM,yBAAyB,CAAC;AAI9D,OAAO,EAEL,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EAEjB,MAAM,EAON,iBAAiB,EACjB,mBAAmB,EACnB,cAAc,GACf,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAC,UAAU,EAAoB,MAAM,eAAe,CAAC;AAE5D,+FAA+F;AAC/F,gGAAgG;AAChG,sFAAsF;AACtF,EAAE;AACF,2FAA2F;AAC3F,yFAAyF;AACzF,yFAAyF;AACzF,0FAA0F;AAC1F,8FAA8F;AAC9F,qEAAqE;AACrE,MAAM,0BAA0B,GAAG,CAAC,qBAAqB,GAAG,CAAC,CAAC,GAAG,eAAe,CAAC;AAiBjF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH,MAAM,OAAO,cAAc;IACR,MAAM,CAAkB;IACxB,aAAa,CAAgB;IAC7B,KAAK,CAAS;IACd,WAAW,CAAoB;IAC/B,MAAM,CAAc;IACpB,eAAe,CAAkB;IACjC,OAAO,CAAiB;IACxB,MAAM,CAAU;IACzB,WAAW,GAAG,IAAI,GAAG,EAAwB,CAAC;IACtD,wDAAwD;IACxD,wFAAwF;IACxF,sEAAsE;IAC9D,0BAA0B,GAAG,IAAI,GAAG,EAAoC,CAAC;IACjF,8GAA8G;IAC9G,gCAAgC;IACxB,oBAAoB,GAAG,IAAI,GAAG,EAAmB,CAAC;IAE1D,YAAY,EACV,MAAM,EACN,aAAa,EACb,KAAK,EACL,WAAW,EACX,MAAM,EACN,eAAe,EACf,OAAO,EACP,MAAM,GACqB;QAC3B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,EAAE;gBAC3D,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;gBACxE,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,oBAAoB,CAAC,GAAG,CACnD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAC1C,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,CAAC,KAAK,GAAG,UAAU,CAAC,sBAAsB,EAAE,CAAC,MAAM,EACzE,CAAC,CACF,CACF,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,UAAU,CAAC,mBAAmB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACtE,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;YACzC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,mBAAmB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACzE,CAAC,CAAC,CAAC;IACL,CAAC;IAED,QAAQ,CAAC,OAAgB;QACvB,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAI,KAAK,CAAC;IAC5D,CAAC;IAED;;OAEG;IACH,mBAAmB,CAAC,OAAgB;QAClC,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5F,CAAC;IAED,qBAAqB,CAAC,OAAgB;QACpC,MAAM,KAAK,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;YACf,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC5C,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;IAED,iBAAiB,CAAC,OAAgB;QAChC,OAAO,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;IAED,GAAG,CAAC,OAAgB;QAClB,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,OAAgB;QACrB,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAgB;QACpB,IAAI,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,aAAa,GAAG,UAAU,EAAE,aAAa,CAAC;QAC9C,IAAI,YAAY,GAAG,CAAC,CAAC;QACrB,OAAO,UAAU,EAAE,CAAC;YAClB,YAAY,EAAE,CAAC;YACf,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACjC,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC;YACvD,aAAa,GAAG,UAAU,EAAE,aAAa,CAAC;QAC5C,CAAC;QACD,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,kDAAkD,EAAE,EAAC,YAAY,EAAC,CAAC,CAAC;QACvF,IAAI,CAAC,cAAc,EAAE,CAAC;IACxB,CAAC;IAED,WAAW,GAAG,CAAC,UAA6B,EAAE,EAAE;QAC9C,IAAI,YAAY,GAAG,CAAC,CAAC;QACrB,MAAM,UAAU,GAAG,uBAAuB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAC7D,KAAK,MAAM,CAAC,EAAE,UAAU,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YAC9C,IAAI,UAAU,CAAC,IAAI,GAAG,UAAU,EAAE,CAAC;gBACjC,YAAY,EAAE,CAAC;gBACf,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;QACD,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,wDAAwD,EAAE,EAAC,YAAY,EAAC,CAAC,CAAC;QAC7F,IAAI,CAAC,cAAc,EAAE,CAAC;IACxB,CAAC,CAAC;IAEF,UAAU,CAAC,EAAC,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAkB;QACpF,kJAAkJ;QAClJ,IAAI,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,CAAgB,CAAC;QACnE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,EAAC,QAAQ,EAAE,YAAY,EAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAE3E,IAAI,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC9B,aAAa;gBACb,UAAU,GAAG,gBAAgB,CAAC,eAAe,CAAC;oBAC5C,KAAK,EAAE,KAAyC;oBAChD,YAAY;oBACZ,YAAY;oBACZ,QAAQ;oBACR,MAAM;oBACN,gBAAgB;oBAChB,SAAS;iBACV,CAAC,CAAC;YACL,CAAC;iBAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACtC,YAAY;gBACZ,UAAU,GAAG,iBAAiB,CAAC,eAAe,CAAC;oBAC7C,KAAK;oBACL,YAAY;oBACZ,YAAY;oBACZ,QAAQ;oBACR,MAAM;oBACN,gBAAgB;oBAChB,SAAS;iBACV,CAAC,CAAC;YACL,CAAC;iBAAM,IAAI,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACpC,YAAY;gBACZ,UAAU,GAAG,iBAAiB,CAAC,eAAe,CAAC;oBAC7C,KAAK,EAAE,KAAuD;oBAC9D,YAAY;oBACZ,YAAY;oBACZ,QAAQ;oBACR,cAAc,EAAE,IAAI,CAAC,aAAa,CAAC,cAAc;oBACjD,cAAc,EAAE,IAAI,CAAC,aAAa,CAAC,cAAc;oBACjD,MAAM;oBACN,gBAAgB;oBAChB,SAAS;iBACV,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,oBAAoB;gBACpB,UAAU,GAAG,eAAe,CAAC,eAAe,CAAC;oBAC3C,KAAK,EAAE,KAAuC;oBAC9C,YAAY;oBACZ,YAAY;oBACZ,QAAQ;oBACR,MAAM;oBACN,gBAAgB;oBAChB,SAAS;iBACV,CAAC,CAAC;YACL,CAAC;YACD,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,UAAU,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC;YACxD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC3B,UAAU,CAAC,QAAQ,CAAC,EAAC,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAC,CAAC,CAAC;QAClF,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,4DAA4D,EAAE,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC;YAC1G,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,UAAU,CAAC,mBAAmB,CAAC,GAAG,CAAC,EAAC,MAAM,EAAC,CAAC,CAAC;QACvE,CAAC;QAED,OAAO,UAAwB,CAAC;IAClC,CAAC;IAED,SAAS,CACP,EACE,YAAY,EACZ,WAAW,EACX,MAAM,EACN,gBAAgB,EAChB,SAAS,GAC4D,EACvE,IAAI,GAAqB,EAAE;QAE3B,kJAAkJ;QAClJ,IAAI,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,CAAgB,CAAC;QACnE,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,GAAG,IAAI,CAAC;YACf,MAAM,EAAC,QAAQ,EAAE,YAAY,EAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACnG,UAAU,GAAG,eAAe,CAAC,cAAc,CAAC;gBAC1C,WAAW;gBACX,YAAY;gBACZ,YAAY;gBACZ,QAAQ;gBACR,MAAM;gBACN,gBAAgB;gBAChB,SAAS;aACV,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC;YACvD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QACjD,CAAC;QAED,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,wBAAwB,CAChC;gBACE,IAAI,EAAE,4BAA4B,CAAC,sBAAsB;gBACzD,UAAU,EAAE,UAAU,CAAC,IAAI;gBAC3B,aAAa,EAAE,MAAM,CAAC,KAAK;gBAC3B,GAAG,UAAU,CAAC,UAAU,EAAE;aAC3B,EACD,4CAA4C,WAAW,CAAC,KAAK,EAAE,CAChE,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3C,UAAU,CAAC,OAAO,CAAC,EAAC,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAC,CAAC,CAAC;QACvF,CAAC;aAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,EAAE,KAAK,CAChB,gCAAgC,WAAW,CAAC,KAAK,sCAAsC,EACvF,UAAU,CAAC,UAAU,EAAE,CACxB,CAAC;YACF,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,UAAU,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAC,MAAM,EAAC,CAAC,CAAC;YACpE,IAAI,IAAI,CAAC,wBAAwB,EAAE,CAAC;gBAClC,MAAM,IAAI,wBAAwB,CAAC;oBACjC,IAAI,EAAE,4BAA4B,CAAC,yBAAyB;oBAC5D,GAAG,UAAU,CAAC,UAAU,EAAE;iBAC3B,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,WAAW,CACT,EACE,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,MAAM,EACN,SAAS,GACmE,EAC9E,IAAI,GAAqB,EAAE;QAE3B,IAAI,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACpD,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,GAAG,IAAI,CAAC;YACf,MAAM,EAAC,QAAQ,EAAE,YAAY,EAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACrG,UAAU,GAAG,iBAAiB,CAAC,gBAAgB,CAAC;gBAC9C,aAAa;gBACb,YAAY;gBACZ,YAAY;gBACZ,QAAQ;gBACR,MAAM;gBACN,gBAAgB;gBAChB,SAAS;gBACT,cAAc,EAAE,IAAI,CAAC,aAAa,CAAC,cAAc;gBACjD,cAAc,EAAE,IAAI,CAAC,aAAa,CAAC,cAAc;aAClD,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,UAAU,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC;YACzD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QACjD,CAAC;QAED,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,wBAAwB,CAChC;gBACE,IAAI,EAAE,4BAA4B,CAAC,sBAAsB;gBACzD,UAAU,EAAE,UAAU,CAAC,IAAI;gBAC3B,aAAa,EAAE,MAAM,CAAC,OAAO;gBAC7B,GAAG,UAAU,CAAC,UAAU,EAAE;aAC3B,EACD,8CAA8C,aAAa,CAAC,KAAK,EAAE,CACpE,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/C,UAAU,CAAC,SAAS,CAAC,EAAC,aAAa,EAAE,YAAY,EAAE,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAC,CAAC,CAAC;QAC3F,CAAC;aAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,EAAE,KAAK,CAChB,kCAAkC,aAAa,CAAC,KAAK,sCAAsC,EAC3F,UAAU,CAAC,UAAU,EAAE,CACxB,CAAC;YACF,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,UAAU,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAC,MAAM,EAAC,CAAC,CAAC;YACtE,IAAI,IAAI,CAAC,wBAAwB,EAAE,CAAC;gBAClC,MAAM,IAAI,wBAAwB,CAAC;oBACjC,IAAI,EAAE,4BAA4B,CAAC,2BAA2B;oBAC9D,GAAG,UAAU,CAAC,UAAU,EAAE;iBAC3B,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAED;;OAEG;IACH,2BAA2B,CAAC,IAAU,EAAE,YAAqB,EAAE,SAAuB;QACpF,MAAM,OAAO,GAAG,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC1D,MAAM,eAAe,GAAG,OAAO,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;QACnD,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,kDAAkD;QAClD,OAAO,eAAe,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IACrD,CAAC;IAED;;;OAGG;IACH,6BAA6B,CAAC,IAAU,EAAE,YAAqB,EAAE,SAAuB;QACtF,IAAI,OAAO,GAAG,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG,IAAI,GAAG,EAAyB,CAAC;YAC3C,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACrD,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IACvC,CAAC;IAEO,gBAAgB,CAAC,IAAU;QAIjC,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAC/C,OAAO;YACL,QAAQ;YACR,YAAY,EAAE,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;SACnF,CAAC;IACJ,CAAC;IAED;;;OAGG;IACK,cAAc;QACpB,IAAI,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,0BAA0B,CAAC;QAEvE,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;YACtB,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACrF,KAAK,MAAM,CAAC,EAAE,UAAU,CAAC,IAAI,MAAM,EAAE,CAAC;gBACpC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;gBACjC,aAAa,EAAE,CAAC;gBAChB,IAAI,aAAa,IAAI,CAAC;oBAAE,OAAO;YACjC,CAAC;QACH,CAAC;QACD,aAAa,CAAC,IAAI,CAAC,0BAA0B,EAAE,0BAA0B,CAAC,CAAC;IAC7E,CAAC;IAEO,eAAe,CAAC,UAAuB;QAC7C,yGAAyG;QACzG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,sBAAsB,EAAE,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IACnD,CAAC;CACF;AAED,IAAK,4BAIJ;AAJD,WAAK,4BAA4B;IAC/B,yGAAyE,CAAA;IACzE,+GAA+E,CAAA;IAC/E,mHAAmF,CAAA;AACrF,CAAC,EAJI,4BAA4B,KAA5B,4BAA4B,QAIhC;AAeD,MAAM,wBAAyB,SAAQ,aAA2C;CAAG"}
|
|
@@ -3,19 +3,22 @@ import { EpochShuffling, IBeaconStateView } from "@lodestar/state-transition";
|
|
|
3
3
|
import { Attestation, CommitteeIndex, Epoch, IndexedAttestation, RootHex, Slot } from "@lodestar/types";
|
|
4
4
|
import { LodestarError, Logger } from "@lodestar/utils";
|
|
5
5
|
import { Metrics } from "../metrics/metrics.js";
|
|
6
|
+
export declare enum ShufflingPromiseCancelReason {
|
|
7
|
+
regenError = "regen_error",
|
|
8
|
+
decisionRootMismatch = "decision_root_mismatch",
|
|
9
|
+
pruned = "pruned"
|
|
10
|
+
}
|
|
6
11
|
export type ShufflingCacheOpts = {
|
|
7
12
|
maxShufflingCacheEpochs?: number;
|
|
8
13
|
};
|
|
9
14
|
/**
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
* - 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
|
|
13
|
-
* - skip computing shuffling when loading state bytes from disk
|
|
15
|
+
* Cache recent epoch shufflings for lookahead duties, gossip validation, and block production.
|
|
16
|
+
* Pending promises deduplicate computation of missing shufflings.
|
|
14
17
|
*/
|
|
15
18
|
export declare class ShufflingCache {
|
|
16
19
|
readonly metrics: Metrics | null;
|
|
17
20
|
readonly logger: Logger | null;
|
|
18
|
-
/**
|
|
21
|
+
/** Pruned to the `maxEpochs` highest epochs every time we add a shuffling */
|
|
19
22
|
private readonly itemsByDecisionRootByEpoch;
|
|
20
23
|
private readonly maxEpochs;
|
|
21
24
|
constructor(metrics?: Metrics | null, logger?: Logger | null, opts?: ShufflingCacheOpts, precalculatedShufflings?: {
|
|
@@ -34,9 +37,7 @@ export declare class ShufflingCache {
|
|
|
34
37
|
*/
|
|
35
38
|
get(epoch: Epoch, decisionRoot: RootHex): Promise<EpochShuffling | null>;
|
|
36
39
|
/**
|
|
37
|
-
* Get a shuffling synchronously, return null if not present.
|
|
38
|
-
* The only time we have a promise cache item is when we regen shuffling for attestation, which never happens
|
|
39
|
-
* with default chain option.
|
|
40
|
+
* Get a shuffling synchronously, return null if not present or if it's still being computed.
|
|
40
41
|
*/
|
|
41
42
|
getSync(epoch: Epoch, decisionRoot: RootHex): EpochShuffling | null;
|
|
42
43
|
/**
|
|
@@ -50,9 +51,14 @@ export declare class ShufflingCache {
|
|
|
50
51
|
* Uses the stored decision roots from epochCtx.
|
|
51
52
|
*/
|
|
52
53
|
processState(state: IBeaconStateView): void;
|
|
54
|
+
/**
|
|
55
|
+
* Resolve a pending promise with null so that waiters don't hang, then remove it.
|
|
56
|
+
*/
|
|
57
|
+
cancelPromise(epoch: Epoch, decisionRoot: RootHex, reason: ShufflingPromiseCancelReason): void;
|
|
53
58
|
getIndexedAttestation(epoch: number, decisionRoot: string, fork: ForkSeq, attestation: Attestation): IndexedAttestation;
|
|
54
59
|
getAttestingIndices(epoch: number, decisionRoot: string, fork: ForkSeq, attestation: Attestation): number[];
|
|
55
60
|
getBeaconCommittee(epoch: number, decisionRoot: string, slot: Slot, index: CommitteeIndex): Uint32Array;
|
|
61
|
+
getBeaconCommitteeOrNull(epoch: number, decisionRoot: string, slot: Slot, index: CommitteeIndex): Uint32Array | null;
|
|
56
62
|
getBeaconCommittees(epoch: number, decisionRoot: string, slot: Slot, indices: CommitteeIndex[]): Uint32Array[];
|
|
57
63
|
private getShufflingOrThrow;
|
|
58
64
|
/**
|
|
@@ -60,6 +66,10 @@ export declare class ShufflingCache {
|
|
|
60
66
|
* resolve the promise with the built shuffling
|
|
61
67
|
*/
|
|
62
68
|
private set;
|
|
69
|
+
/**
|
|
70
|
+
* Keep the `maxEpochs` highest epochs, regardless of insertion order.
|
|
71
|
+
*/
|
|
72
|
+
private prune;
|
|
63
73
|
}
|
|
64
74
|
export declare enum ShufflingCacheErrorCode {
|
|
65
75
|
NO_SHUFFLING_FOUND = "SHUFFLING_CACHE_ERROR_NO_SHUFFLING_FOUND"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shufflingCache.d.ts","sourceRoot":"","sources":["../../src/chain/shufflingCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAgB,MAAM,kBAAkB,CAAC;AACxD,OAAO,EACL,cAAc,EACd,gBAAgB,EAIjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAC,WAAW,EAAE,cAAc,EAAE,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,IAAI,EAAC,MAAM,iBAAiB,CAAC;AACtG,OAAO,EAAC,aAAa,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"shufflingCache.d.ts","sourceRoot":"","sources":["../../src/chain/shufflingCache.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import { GENESIS_EPOCH } from "@lodestar/params";
|
|
2
2
|
import { getAttestingIndices, getBeaconCommittees, getIndexedAttestation, } from "@lodestar/state-transition";
|
|
3
|
-
import { LodestarError, MapDef
|
|
3
|
+
import { LodestarError, MapDef } from "@lodestar/utils";
|
|
4
4
|
/**
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
* - don't have shuffling to verify attestations, need to do 1 epoch transition to add shuffling to this cache. This never happens
|
|
8
|
-
* with default chain option of maxSkipSlots = 32
|
|
5
|
+
* Lookahead duties, gossip validation, and block production need epochs n-1, n, and n+1 for current epoch n.
|
|
6
|
+
* Keep the 4 highest epochs so that it works for epoch rotation.
|
|
9
7
|
**/
|
|
10
8
|
const MAX_EPOCHS = 4;
|
|
11
9
|
/**
|
|
@@ -18,16 +16,20 @@ var CacheItemType;
|
|
|
18
16
|
CacheItemType[CacheItemType["shuffling"] = 0] = "shuffling";
|
|
19
17
|
CacheItemType[CacheItemType["promise"] = 1] = "promise";
|
|
20
18
|
})(CacheItemType || (CacheItemType = {}));
|
|
19
|
+
export var ShufflingPromiseCancelReason;
|
|
20
|
+
(function (ShufflingPromiseCancelReason) {
|
|
21
|
+
ShufflingPromiseCancelReason["regenError"] = "regen_error";
|
|
22
|
+
ShufflingPromiseCancelReason["decisionRootMismatch"] = "decision_root_mismatch";
|
|
23
|
+
ShufflingPromiseCancelReason["pruned"] = "pruned";
|
|
24
|
+
})(ShufflingPromiseCancelReason || (ShufflingPromiseCancelReason = {}));
|
|
21
25
|
/**
|
|
22
|
-
*
|
|
23
|
-
*
|
|
24
|
-
* - 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
|
|
25
|
-
* - skip computing shuffling when loading state bytes from disk
|
|
26
|
+
* Cache recent epoch shufflings for lookahead duties, gossip validation, and block production.
|
|
27
|
+
* Pending promises deduplicate computation of missing shufflings.
|
|
26
28
|
*/
|
|
27
29
|
export class ShufflingCache {
|
|
28
30
|
metrics;
|
|
29
31
|
logger;
|
|
30
|
-
/**
|
|
32
|
+
/** Pruned to the `maxEpochs` highest epochs every time we add a shuffling */
|
|
31
33
|
itemsByDecisionRootByEpoch = new MapDef(() => new Map());
|
|
32
34
|
maxEpochs;
|
|
33
35
|
constructor(metrics = null, logger = null, opts = {}, precalculatedShufflings) {
|
|
@@ -35,6 +37,7 @@ export class ShufflingCache {
|
|
|
35
37
|
this.logger = logger;
|
|
36
38
|
if (metrics) {
|
|
37
39
|
metrics.shufflingCache.size.addCollect(() => metrics.shufflingCache.size.set(Array.from(this.itemsByDecisionRootByEpoch.values()).reduce((total, innerMap) => total + innerMap.size, 0)));
|
|
40
|
+
metrics.shufflingCache.epochs.addCollect(() => metrics.shufflingCache.epochs.set(this.itemsByDecisionRootByEpoch.size));
|
|
38
41
|
}
|
|
39
42
|
this.maxEpochs = opts.maxShufflingCacheEpochs ?? MAX_EPOCHS;
|
|
40
43
|
precalculatedShufflings?.map(({ shuffling, decisionRoot }) => {
|
|
@@ -76,7 +79,7 @@ export class ShufflingCache {
|
|
|
76
79
|
* Return null if we don't have a shuffling for this epoch and dependentRootHex.
|
|
77
80
|
*/
|
|
78
81
|
async get(epoch, decisionRoot) {
|
|
79
|
-
const cacheItem = this.itemsByDecisionRootByEpoch.
|
|
82
|
+
const cacheItem = this.itemsByDecisionRootByEpoch.get(epoch)?.get(decisionRoot);
|
|
80
83
|
if (cacheItem === undefined) {
|
|
81
84
|
this.metrics?.shufflingCache.miss.inc();
|
|
82
85
|
return null;
|
|
@@ -89,12 +92,10 @@ export class ShufflingCache {
|
|
|
89
92
|
return cacheItem.promise;
|
|
90
93
|
}
|
|
91
94
|
/**
|
|
92
|
-
* Get a shuffling synchronously, return null if not present.
|
|
93
|
-
* The only time we have a promise cache item is when we regen shuffling for attestation, which never happens
|
|
94
|
-
* with default chain option.
|
|
95
|
+
* Get a shuffling synchronously, return null if not present or if it's still being computed.
|
|
95
96
|
*/
|
|
96
97
|
getSync(epoch, decisionRoot) {
|
|
97
|
-
const cacheItem = this.itemsByDecisionRootByEpoch.
|
|
98
|
+
const cacheItem = this.itemsByDecisionRootByEpoch.get(epoch)?.get(decisionRoot);
|
|
98
99
|
if (cacheItem === undefined) {
|
|
99
100
|
this.metrics?.shufflingCache.miss.inc();
|
|
100
101
|
return null;
|
|
@@ -111,7 +112,7 @@ export class ShufflingCache {
|
|
|
111
112
|
* `NativeBeaconStateView`.
|
|
112
113
|
*/
|
|
113
114
|
has(epoch, decisionRoot) {
|
|
114
|
-
const cacheItem = this.itemsByDecisionRootByEpoch.
|
|
115
|
+
const cacheItem = this.itemsByDecisionRootByEpoch.get(epoch)?.get(decisionRoot);
|
|
115
116
|
return cacheItem !== undefined && isShufflingCacheItem(cacheItem);
|
|
116
117
|
}
|
|
117
118
|
/**
|
|
@@ -131,6 +132,23 @@ export class ShufflingCache {
|
|
|
131
132
|
this.set(state.getNextShuffling(), state.nextDecisionRoot);
|
|
132
133
|
}
|
|
133
134
|
}
|
|
135
|
+
/**
|
|
136
|
+
* Resolve a pending promise with null so that waiters don't hang, then remove it.
|
|
137
|
+
*/
|
|
138
|
+
cancelPromise(epoch, decisionRoot, reason) {
|
|
139
|
+
const itemsByDecisionRoot = this.itemsByDecisionRootByEpoch.get(epoch);
|
|
140
|
+
const cacheItem = itemsByDecisionRoot?.get(decisionRoot);
|
|
141
|
+
if (itemsByDecisionRoot === undefined || cacheItem === undefined || !isPromiseCacheItem(cacheItem)) {
|
|
142
|
+
return;
|
|
143
|
+
}
|
|
144
|
+
cacheItem.resolveFn(null);
|
|
145
|
+
itemsByDecisionRoot.delete(decisionRoot);
|
|
146
|
+
if (itemsByDecisionRoot.size === 0) {
|
|
147
|
+
this.itemsByDecisionRootByEpoch.delete(epoch);
|
|
148
|
+
}
|
|
149
|
+
this.metrics?.shufflingCache.cancelledPromises.inc({ reason });
|
|
150
|
+
this.logger?.debug("Cancelled shuffling promise", { epoch, decisionRoot, reason });
|
|
151
|
+
}
|
|
134
152
|
getIndexedAttestation(epoch, decisionRoot, fork, attestation) {
|
|
135
153
|
const shuffling = this.getShufflingOrThrow(epoch, decisionRoot);
|
|
136
154
|
return getIndexedAttestation(shuffling, fork, attestation);
|
|
@@ -142,6 +160,10 @@ export class ShufflingCache {
|
|
|
142
160
|
getBeaconCommittee(epoch, decisionRoot, slot, index) {
|
|
143
161
|
return this.getBeaconCommittees(epoch, decisionRoot, slot, [index])[0];
|
|
144
162
|
}
|
|
163
|
+
getBeaconCommitteeOrNull(epoch, decisionRoot, slot, index) {
|
|
164
|
+
const shuffling = this.getSync(epoch, decisionRoot);
|
|
165
|
+
return shuffling === null ? null : getBeaconCommittees(shuffling, slot, [index])[0];
|
|
166
|
+
}
|
|
145
167
|
getBeaconCommittees(epoch, decisionRoot, slot, indices) {
|
|
146
168
|
const shuffling = this.getShufflingOrThrow(epoch, decisionRoot);
|
|
147
169
|
return getBeaconCommittees(shuffling, slot, indices);
|
|
@@ -177,8 +199,40 @@ export class ShufflingCache {
|
|
|
177
199
|
}
|
|
178
200
|
// set the shuffling
|
|
179
201
|
shufflingAtEpoch.set(decisionRoot, { type: CacheItemType.shuffling, shuffling });
|
|
180
|
-
|
|
181
|
-
|
|
202
|
+
this.prune();
|
|
203
|
+
}
|
|
204
|
+
/**
|
|
205
|
+
* Keep the `maxEpochs` highest epochs, regardless of insertion order.
|
|
206
|
+
*/
|
|
207
|
+
prune() {
|
|
208
|
+
const toDelete = this.itemsByDecisionRootByEpoch.size - this.maxEpochs;
|
|
209
|
+
if (toDelete <= 0) {
|
|
210
|
+
return;
|
|
211
|
+
}
|
|
212
|
+
const prunedEpochs = Array.from(this.itemsByDecisionRootByEpoch.keys())
|
|
213
|
+
.sort((a, b) => a - b)
|
|
214
|
+
.slice(0, toDelete);
|
|
215
|
+
let prunedShufflings = 0;
|
|
216
|
+
for (const epoch of prunedEpochs) {
|
|
217
|
+
for (const cacheItem of this.itemsByDecisionRootByEpoch.get(epoch)?.values() ?? []) {
|
|
218
|
+
if (isPromiseCacheItem(cacheItem)) {
|
|
219
|
+
cacheItem.resolveFn(null);
|
|
220
|
+
this.metrics?.shufflingCache.cancelledPromises.inc({ reason: ShufflingPromiseCancelReason.pruned });
|
|
221
|
+
}
|
|
222
|
+
else {
|
|
223
|
+
prunedShufflings++;
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
this.itemsByDecisionRootByEpoch.delete(epoch);
|
|
227
|
+
}
|
|
228
|
+
this.metrics?.shufflingCache.prunedShufflings.inc(prunedShufflings);
|
|
229
|
+
this.logger?.verbose("Pruned shuffling cache", {
|
|
230
|
+
prunedEpochs: prunedEpochs.join(","),
|
|
231
|
+
prunedShufflings,
|
|
232
|
+
cachedEpochs: Array.from(this.itemsByDecisionRootByEpoch.keys())
|
|
233
|
+
.sort((a, b) => a - b)
|
|
234
|
+
.join(","),
|
|
235
|
+
});
|
|
182
236
|
}
|
|
183
237
|
}
|
|
184
238
|
function isShufflingCacheItem(item) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shufflingCache.js","sourceRoot":"","sources":["../../src/chain/shufflingCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,aAAa,EAAC,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAGL,mBAAmB,EACnB,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAC,aAAa,EAAU,MAAM,
|
|
1
|
+
{"version":3,"file":"shufflingCache.js","sourceRoot":"","sources":["../../src/chain/shufflingCache.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,8 +35,12 @@ export type ValidatorMonitorOpts = {
|
|
|
35
35
|
/** Log validator monitor events as info */
|
|
36
36
|
validatorMonitorLogs?: boolean;
|
|
37
37
|
};
|
|
38
|
+
export type NativeValidatorMonitor = {
|
|
39
|
+
registerLocalValidator(index: ValidatorIndex): void;
|
|
40
|
+
unregisterLocalValidator(index: ValidatorIndex): void;
|
|
41
|
+
};
|
|
38
42
|
export declare const defaultValidatorMonitorOpts: ValidatorMonitorOpts;
|
|
39
|
-
export declare function createValidatorMonitor(metricsRegister: RegistryMetricCreator | null, config: ChainForkConfig, genesisTime: number, logger: Logger, opts: ValidatorMonitorOpts): ValidatorMonitor;
|
|
43
|
+
export declare function createValidatorMonitor(metricsRegister: RegistryMetricCreator | null, config: ChainForkConfig, genesisTime: number, logger: Logger, opts: ValidatorMonitorOpts, nativeValidatorMonitor?: NativeValidatorMonitor | null): ValidatorMonitor;
|
|
40
44
|
/**
|
|
41
45
|
* Cache to prevent accessing the state tree to fetch block roots repeteadly.
|
|
42
46
|
* In normal network conditions the same root is read multiple times, specially the target.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validatorMonitor.d.ts","sourceRoot":"","sources":["../../src/chain/validatorMonitor.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"validatorMonitor.d.ts","sourceRoot":"","sources":["../../src/chain/validatorMonitor.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,7 +70,7 @@ function getEpochSummary(validator, epoch) {
|
|
|
70
70
|
}
|
|
71
71
|
return summary;
|
|
72
72
|
}
|
|
73
|
-
export function createValidatorMonitor(metricsRegister, config, genesisTime, logger, opts) {
|
|
73
|
+
export function createValidatorMonitor(metricsRegister, config, genesisTime, logger, opts, nativeValidatorMonitor = null) {
|
|
74
74
|
const logLevel = opts.validatorMonitorLogs ? LogLevel.info : LogLevel.debug;
|
|
75
75
|
const log = (message, context) => {
|
|
76
76
|
logger[logLevel](message, context);
|
|
@@ -90,15 +90,20 @@ export function createValidatorMonitor(metricsRegister, config, genesisTime, log
|
|
|
90
90
|
lastRegisteredTimeMs: 0,
|
|
91
91
|
}));
|
|
92
92
|
let lastRegisteredStatusEpoch = -1;
|
|
93
|
+
let lastAttestationSummaryEpoch = -1;
|
|
93
94
|
// Track validator additions/removals per epoch for logging
|
|
94
95
|
const addedValidatorsInEpoch = new Set();
|
|
95
96
|
const removedValidatorsInEpoch = new Set();
|
|
96
|
-
const
|
|
97
|
+
const shouldRegisterStateDerivedMetrics = nativeValidatorMonitor === null;
|
|
98
|
+
const validatorMonitorMetrics = metricsRegister
|
|
99
|
+
? createValidatorMonitorMetrics(metricsRegister, shouldRegisterStateDerivedMetrics)
|
|
100
|
+
: null;
|
|
97
101
|
const validatorMonitor = {
|
|
98
102
|
registerLocalValidator(index) {
|
|
99
103
|
const isNewValidator = !validators.has(index);
|
|
100
104
|
validators.getOrDefault(index).lastRegisteredTimeMs = Date.now();
|
|
101
105
|
if (isNewValidator) {
|
|
106
|
+
nativeValidatorMonitor?.registerLocalValidator(index);
|
|
102
107
|
addedValidatorsInEpoch.add(index);
|
|
103
108
|
}
|
|
104
109
|
},
|
|
@@ -121,7 +126,7 @@ export function createValidatorMonitor(metricsRegister, config, genesisTime, log
|
|
|
121
126
|
}
|
|
122
127
|
// Track total balance instead of per-validator balance to reduce metric cardinality
|
|
123
128
|
let totalBalance = 0;
|
|
124
|
-
for (const
|
|
129
|
+
for (const index of validators.keys()) {
|
|
125
130
|
// We subtract two from the state of the epoch that generated these summaries.
|
|
126
131
|
//
|
|
127
132
|
// - One to account for it being the previous epoch.
|
|
@@ -129,66 +134,30 @@ export function createValidatorMonitor(metricsRegister, config, genesisTime, log
|
|
|
129
134
|
// statuses.
|
|
130
135
|
const summary = statusToSummary(inclusionDelays[index], flags[index], isActiveCurrEpoch[index], isActiveInPrevEpoch[index]);
|
|
131
136
|
if (summary.isPrevSourceAttester) {
|
|
132
|
-
validatorMonitorMetrics?.prevEpochOnChainSourceAttesterHit
|
|
137
|
+
validatorMonitorMetrics?.prevEpochOnChainSourceAttesterHit?.inc();
|
|
133
138
|
}
|
|
134
139
|
else {
|
|
135
|
-
validatorMonitorMetrics?.prevEpochOnChainSourceAttesterMiss
|
|
140
|
+
validatorMonitorMetrics?.prevEpochOnChainSourceAttesterMiss?.inc();
|
|
136
141
|
}
|
|
137
142
|
if (summary.isPrevHeadAttester) {
|
|
138
|
-
validatorMonitorMetrics?.prevEpochOnChainHeadAttesterHit
|
|
143
|
+
validatorMonitorMetrics?.prevEpochOnChainHeadAttesterHit?.inc();
|
|
139
144
|
}
|
|
140
145
|
else {
|
|
141
|
-
validatorMonitorMetrics?.prevEpochOnChainHeadAttesterMiss
|
|
146
|
+
validatorMonitorMetrics?.prevEpochOnChainHeadAttesterMiss?.inc();
|
|
142
147
|
}
|
|
143
148
|
if (summary.isPrevTargetAttester) {
|
|
144
|
-
validatorMonitorMetrics?.prevEpochOnChainTargetAttesterHit
|
|
149
|
+
validatorMonitorMetrics?.prevEpochOnChainTargetAttesterHit?.inc();
|
|
145
150
|
}
|
|
146
151
|
else {
|
|
147
|
-
validatorMonitorMetrics?.prevEpochOnChainTargetAttesterMiss
|
|
148
|
-
}
|
|
149
|
-
const prevEpochSummary = monitoredValidator.summaries.get(previousEpoch);
|
|
150
|
-
const attestationCorrectHead = prevEpochSummary?.attestationCorrectHead;
|
|
151
|
-
if (attestationCorrectHead !== null && attestationCorrectHead !== undefined) {
|
|
152
|
-
if (attestationCorrectHead) {
|
|
153
|
-
validatorMonitorMetrics?.prevOnChainAttesterCorrectHead.inc();
|
|
154
|
-
}
|
|
155
|
-
else {
|
|
156
|
-
validatorMonitorMetrics?.prevOnChainAttesterIncorrectHead.inc();
|
|
157
|
-
}
|
|
158
|
-
}
|
|
159
|
-
const attestationMinBlockInclusionDistance = prevEpochSummary?.attestationMinBlockInclusionDistance;
|
|
160
|
-
const inclusionDistance = attestationMinBlockInclusionDistance != null && attestationMinBlockInclusionDistance > 0
|
|
161
|
-
? // altair, attestation is not missed
|
|
162
|
-
attestationMinBlockInclusionDistance
|
|
163
|
-
: summary.inclusionDistance
|
|
164
|
-
? // phase0, this is from the state transition
|
|
165
|
-
summary.inclusionDistance
|
|
166
|
-
: null;
|
|
167
|
-
if (inclusionDistance !== null) {
|
|
168
|
-
validatorMonitorMetrics?.prevEpochOnChainInclusionDistance.observe(inclusionDistance);
|
|
169
|
-
validatorMonitorMetrics?.prevEpochOnChainAttesterHit.inc();
|
|
170
|
-
}
|
|
171
|
-
else {
|
|
172
|
-
validatorMonitorMetrics?.prevEpochOnChainAttesterMiss.inc();
|
|
152
|
+
validatorMonitorMetrics?.prevEpochOnChainTargetAttesterMiss?.inc();
|
|
173
153
|
}
|
|
174
154
|
const balance = balances?.[index];
|
|
175
155
|
if (balance !== undefined) {
|
|
176
156
|
totalBalance += balance;
|
|
177
157
|
}
|
|
178
|
-
if (!summary.isPrevSourceAttester || !summary.isPrevTargetAttester || !summary.isPrevHeadAttester) {
|
|
179
|
-
log("Failed attestation in previous epoch", {
|
|
180
|
-
validator: index,
|
|
181
|
-
prevEpoch: currentEpoch - 1,
|
|
182
|
-
isPrevSourceAttester: summary.isPrevSourceAttester,
|
|
183
|
-
isPrevHeadAttester: summary.isPrevHeadAttester,
|
|
184
|
-
isPrevTargetAttester: summary.isPrevTargetAttester,
|
|
185
|
-
// inclusionDistance is not available in summary since altair
|
|
186
|
-
inclusionDistance,
|
|
187
|
-
});
|
|
188
|
-
}
|
|
189
158
|
}
|
|
190
159
|
if (balances !== undefined) {
|
|
191
|
-
validatorMonitorMetrics?.prevEpochOnChainBalance
|
|
160
|
+
validatorMonitorMetrics?.prevEpochOnChainBalance?.set(totalBalance);
|
|
192
161
|
}
|
|
193
162
|
},
|
|
194
163
|
registerBeaconBlock(src, delaySec, block) {
|
|
@@ -436,6 +405,7 @@ export function createValidatorMonitor(metricsRegister, config, genesisTime, log
|
|
|
436
405
|
// Prune validators not seen in a while
|
|
437
406
|
for (const [index, validator] of validators.entries()) {
|
|
438
407
|
if (Date.now() - validator.lastRegisteredTimeMs > retainRegisteredValidatorsMs) {
|
|
408
|
+
nativeValidatorMonitor?.unregisterLocalValidator(index);
|
|
439
409
|
validators.delete(index);
|
|
440
410
|
removedValidatorsInEpoch.add(index);
|
|
441
411
|
}
|
|
@@ -464,6 +434,35 @@ export function createValidatorMonitor(metricsRegister, config, genesisTime, log
|
|
|
464
434
|
if (validators.size === 0) {
|
|
465
435
|
return;
|
|
466
436
|
}
|
|
437
|
+
// On-chain attestation summary of prevEpoch. Reads only the epoch summaries filled by
|
|
438
|
+
// registerAttestationInBlock(), so it works with both TS and native state transition.
|
|
439
|
+
if (prevEpoch > lastAttestationSummaryEpoch) {
|
|
440
|
+
lastAttestationSummaryEpoch = prevEpoch;
|
|
441
|
+
for (const monitoredValidator of validators.values()) {
|
|
442
|
+
const prevEpochSummary = monitoredValidator.summaries.get(prevEpoch);
|
|
443
|
+
const attestationCorrectHead = prevEpochSummary?.attestationCorrectHead;
|
|
444
|
+
if (attestationCorrectHead !== null && attestationCorrectHead !== undefined) {
|
|
445
|
+
if (attestationCorrectHead) {
|
|
446
|
+
validatorMonitorMetrics?.prevOnChainAttesterCorrectHead.inc();
|
|
447
|
+
}
|
|
448
|
+
else {
|
|
449
|
+
validatorMonitorMetrics?.prevOnChainAttesterIncorrectHead.inc();
|
|
450
|
+
}
|
|
451
|
+
}
|
|
452
|
+
const attestationMinBlockInclusionDistance = prevEpochSummary?.attestationMinBlockInclusionDistance;
|
|
453
|
+
const inclusionDistance = attestationMinBlockInclusionDistance != null && attestationMinBlockInclusionDistance > 0
|
|
454
|
+
? // altair, attestation is not missed
|
|
455
|
+
attestationMinBlockInclusionDistance
|
|
456
|
+
: null;
|
|
457
|
+
if (inclusionDistance !== null) {
|
|
458
|
+
validatorMonitorMetrics?.prevEpochOnChainInclusionDistance.observe(inclusionDistance);
|
|
459
|
+
validatorMonitorMetrics?.prevEpochOnChainAttesterHit.inc();
|
|
460
|
+
}
|
|
461
|
+
else {
|
|
462
|
+
validatorMonitorMetrics?.prevEpochOnChainAttesterMiss.inc();
|
|
463
|
+
}
|
|
464
|
+
}
|
|
465
|
+
}
|
|
467
466
|
const rootCache = new RootHexCache(headState);
|
|
468
467
|
if (isStatePostAltair(headState)) {
|
|
469
468
|
const prevEpochStartSlot = computeStartSlotAtEpoch(prevEpoch);
|
|
@@ -479,6 +478,16 @@ export function createValidatorMonitor(metricsRegister, config, genesisTime, log
|
|
|
479
478
|
epoch: prevEpoch,
|
|
480
479
|
summary,
|
|
481
480
|
});
|
|
481
|
+
if (!flags.timelySource || !flags.timelyTarget || !flags.timelyHead) {
|
|
482
|
+
log("Failed attestation in previous epoch", {
|
|
483
|
+
validator: index,
|
|
484
|
+
prevEpoch,
|
|
485
|
+
isPrevSourceAttester: flags.timelySource,
|
|
486
|
+
isPrevHeadAttester: flags.timelyHead,
|
|
487
|
+
isPrevTargetAttester: flags.timelyTarget,
|
|
488
|
+
inclusionDistance: validator.summaries.get(prevEpoch)?.attestationMinBlockInclusionDistance ?? null,
|
|
489
|
+
});
|
|
490
|
+
}
|
|
482
491
|
}
|
|
483
492
|
}
|
|
484
493
|
if (headState.previousProposers !== null) {
|
|
@@ -813,7 +822,8 @@ export class RootHexCache {
|
|
|
813
822
|
return root;
|
|
814
823
|
}
|
|
815
824
|
}
|
|
816
|
-
function createValidatorMonitorMetrics(register) {
|
|
825
|
+
function createValidatorMonitorMetrics(register, registerStateDerivedMetrics = true) {
|
|
826
|
+
const stateDerivedRegister = registerStateDerivedMetrics ? register : null;
|
|
817
827
|
return {
|
|
818
828
|
validatorsConnected: register.gauge({
|
|
819
829
|
name: "validator_monitor_validators",
|
|
@@ -829,7 +839,7 @@ function createValidatorMonitorMetrics(register) {
|
|
|
829
839
|
help: "Count of validators monitored by this beacon node that are part of sync committee",
|
|
830
840
|
}),
|
|
831
841
|
// Validator Monitor Metrics (per-epoch summaries)
|
|
832
|
-
prevEpochOnChainBalance:
|
|
842
|
+
prevEpochOnChainBalance: stateDerivedRegister?.gauge({
|
|
833
843
|
name: "validator_monitor_prev_epoch_on_chain_balance",
|
|
834
844
|
help: "Total balance of all monitored validators after an epoch",
|
|
835
845
|
}),
|
|
@@ -841,19 +851,19 @@ function createValidatorMonitorMetrics(register) {
|
|
|
841
851
|
name: "validator_monitor_prev_epoch_on_chain_attester_miss_total",
|
|
842
852
|
help: "Incremented if validator's submitted attestation is not included in any blocks",
|
|
843
853
|
}),
|
|
844
|
-
prevEpochOnChainSourceAttesterHit:
|
|
854
|
+
prevEpochOnChainSourceAttesterHit: stateDerivedRegister?.gauge({
|
|
845
855
|
name: "validator_monitor_prev_epoch_on_chain_source_attester_hit_total",
|
|
846
856
|
help: "Incremented if the validator is flagged as a previous epoch source attester during per epoch processing",
|
|
847
857
|
}),
|
|
848
|
-
prevEpochOnChainSourceAttesterMiss:
|
|
858
|
+
prevEpochOnChainSourceAttesterMiss: stateDerivedRegister?.gauge({
|
|
849
859
|
name: "validator_monitor_prev_epoch_on_chain_source_attester_miss_total",
|
|
850
860
|
help: "Incremented if the validator is not flagged as a previous epoch source attester during per epoch processing",
|
|
851
861
|
}),
|
|
852
|
-
prevEpochOnChainHeadAttesterHit:
|
|
862
|
+
prevEpochOnChainHeadAttesterHit: stateDerivedRegister?.gauge({
|
|
853
863
|
name: "validator_monitor_prev_epoch_on_chain_head_attester_hit_total",
|
|
854
864
|
help: "Incremented if the validator is flagged as a previous epoch head attester during per epoch processing",
|
|
855
865
|
}),
|
|
856
|
-
prevEpochOnChainHeadAttesterMiss:
|
|
866
|
+
prevEpochOnChainHeadAttesterMiss: stateDerivedRegister?.gauge({
|
|
857
867
|
name: "validator_monitor_prev_epoch_on_chain_head_attester_miss_total",
|
|
858
868
|
help: "Incremented if the validator is not flagged as a previous epoch head attester during per epoch processing",
|
|
859
869
|
}),
|
|
@@ -865,11 +875,11 @@ function createValidatorMonitorMetrics(register) {
|
|
|
865
875
|
name: "validator_monitor_prev_epoch_on_chain_attester_incorrect_head_total",
|
|
866
876
|
help: "Total count of times a validator votes incorrect head",
|
|
867
877
|
}),
|
|
868
|
-
prevEpochOnChainTargetAttesterHit:
|
|
878
|
+
prevEpochOnChainTargetAttesterHit: stateDerivedRegister?.gauge({
|
|
869
879
|
name: "validator_monitor_prev_epoch_on_chain_target_attester_hit_total",
|
|
870
880
|
help: "Incremented if the validator is flagged as a previous epoch target attester during per epoch processing",
|
|
871
881
|
}),
|
|
872
|
-
prevEpochOnChainTargetAttesterMiss:
|
|
882
|
+
prevEpochOnChainTargetAttesterMiss: stateDerivedRegister?.gauge({
|
|
873
883
|
name: "validator_monitor_prev_epoch_on_chain_target_attester_miss_total",
|
|
874
884
|
help: "Incremented if the validator is not flagged as a previous epoch target attester during per epoch processing",
|
|
875
885
|
}),
|