@lodestar/beacon-node 1.50.0-dev.cddd01a6c6 → 1.50.0-dev.ce0e732118
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/validator/index.d.ts +1 -0
- package/lib/api/impl/validator/index.d.ts.map +1 -1
- package/lib/api/impl/validator/index.js +17 -1
- package/lib/api/impl/validator/index.js.map +1 -1
- package/lib/chain/archiveStore/archiveStore.js +1 -1
- 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/blocks/verifyBlock.d.ts.map +1 -1
- package/lib/chain/blocks/verifyBlock.js +1 -1
- 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 +1 -0
- package/lib/chain/chain.d.ts.map +1 -1
- package/lib/chain/chain.js +29 -0
- 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/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 +1 -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/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/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/node/nodejs.d.ts.map +1 -1
- package/lib/node/nodejs.js +25 -3
- package/lib/node/nodejs.js.map +1 -1
- package/lib/sync/range/chain.d.ts.map +1 -1
- package/lib/sync/range/chain.js +5 -1
- package/lib/sync/range/chain.js.map +1 -1
- package/package.json +16 -16
- package/src/api/impl/beacon/index.ts +15 -0
- package/src/api/impl/validator/index.ts +16 -2
- package/src/chain/archiveStore/archiveStore.ts +1 -1
- 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/blocks/verifyBlock.ts +1 -0
- package/src/chain/blocks/verifyBlocksStateTransitionOnly.ts +6 -3
- package/src/chain/chain.ts +33 -0
- package/src/chain/emitter.ts +7 -1
- package/src/chain/forkChoice/index.ts +2 -0
- package/src/chain/opPools/proposerPreferencesPool.ts +14 -10
- package/src/chain/options.ts +2 -2
- package/src/chain/produceBlock/computeNewStateRoot.ts +1 -1
- package/src/chain/regen/regen.ts +12 -4
- package/src/chain/validatorMonitor.ts +75 -57
- package/src/metrics/metrics.ts +21 -6
- package/src/node/nodejs.ts +31 -3
- package/src/sync/range/chain.ts +6 -1
package/lib/chain/emitter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../src/chain/emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAUzC;;;;;;;GAOG;AACH,MAAM,CAAN,IAAY,
|
|
1
|
+
{"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../src/chain/emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAUzC;;;;;;;GAOG;AACH,MAAM,CAAN,IAAY,UA2EX;AA3ED,WAAY,UAAU;IACpB;;;;;OAKG;IACH,uCAAyB,CAAA;IACzB;;;;OAIG;IACH,0DAA4C,CAAA;IAC5C;;;;OAIG;IACH,0DAA4C,CAAA;IAC5C;;;OAGG;IACH,0DAA4C,CAAA;IAC5C;;OAEG;IACH,6EAA+D,CAAA;IAC/D;;;OAGG;IACH,uDAAyC,CAAA;IACzC;;;OAGG;IACH,yDAA2C,CAAA;IAC3C;;;OAGG;IACH,iEAAmD,CAAA;IACnD;;OAEG;IACH,2CAA6B,CAAA;IAC7B;;;OAGG;IACH,uDAAyC,CAAA;IACzC;;OAEG;IACH,mDAAqC,CAAA;IACrC;;OAEG;IACH,mEAAqD,CAAA;IACrD;;OAEG;IACH,2EAA6D,CAAA;IAC7D;;;OAGG;IACH,2DAA6C,CAAA;IAC7C;;;OAGG;IACH,qEAAuD,CAAA;AACzD,CAAC,EA3EW,UAAU,KAAV,UAAU,QA2ErB;AAgDD;;;;;;;;GAQG;AACH,MAAM,OAAO,iBAAkB,SAAS,YAAyE;CAAG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/chain/forkChoice/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAEL,UAAU,EACV,qBAAqB,EAErB,uBAAuB,EAIvB,cAAc,IAAI,iBAAiB,EACpC,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAEL,gBAAgB,EAKjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAC,IAAI,EAAM,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAC,MAAM,EAAY,MAAM,iBAAiB,CAAC;AAElD,OAAO,EAAC,OAAO,EAAC,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAAa,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAE5D,MAAM,MAAM,cAAc,GAAG,iBAAiB,GAAG;IAE/C,qBAAqB,CAAC,EAAE,OAAO,UAAU,CAAC;CAC3C,CAAC;AAEF,oBAAY,gBAAgB;IAC1B,eAAe,sBAAsB;IACrC,WAAW,iBAAiB;CAC7B;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,iBAAiB,EAC1B,WAAW,EAAE,IAAI,EACjB,KAAK,EAAE,gBAAgB,EACvB,gBAAgB,EAAE,OAAO,EACzB,IAAI,EAAE,cAAc,EACpB,uBAAuB,EAAE,uBAAuB,EAChD,WAAW,EAAE,qBAAqB,EAClC,OAAO,EAAE,OAAO,GAAG,IAAI,EACvB,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,CAwBZ;AAED;;GAEG;AACH,wBAAgB,sCAAsC,CACpD,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,iBAAiB,EAC1B,WAAW,EAAE,IAAI,EACjB,KAAK,EAAE,gBAAgB,EACvB,IAAI,EAAE,cAAc,EACpB,uBAAuB,EAAE,uBAAuB,EAChD,WAAW,EAAE,qBAAqB,EAClC,OAAO,EAAE,OAAO,GAAG,IAAI,EACvB,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/chain/forkChoice/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAEL,UAAU,EACV,qBAAqB,EAErB,uBAAuB,EAIvB,cAAc,IAAI,iBAAiB,EACpC,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAEL,gBAAgB,EAKjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAC,IAAI,EAAM,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAC,MAAM,EAAY,MAAM,iBAAiB,CAAC;AAElD,OAAO,EAAC,OAAO,EAAC,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAAa,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAE5D,MAAM,MAAM,cAAc,GAAG,iBAAiB,GAAG;IAE/C,qBAAqB,CAAC,EAAE,OAAO,UAAU,CAAC;CAC3C,CAAC;AAEF,oBAAY,gBAAgB;IAC1B,eAAe,sBAAsB;IACrC,WAAW,iBAAiB;CAC7B;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,iBAAiB,EAC1B,WAAW,EAAE,IAAI,EACjB,KAAK,EAAE,gBAAgB,EACvB,gBAAgB,EAAE,OAAO,EACzB,IAAI,EAAE,cAAc,EACpB,uBAAuB,EAAE,uBAAuB,EAChD,WAAW,EAAE,qBAAqB,EAClC,OAAO,EAAE,OAAO,GAAG,IAAI,EACvB,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,CAwBZ;AAED;;GAEG;AACH,wBAAgB,sCAAsC,CACpD,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,iBAAiB,EAC1B,WAAW,EAAE,IAAI,EACjB,KAAK,EAAE,gBAAgB,EACvB,IAAI,EAAE,cAAc,EACpB,uBAAuB,EAAE,uBAAuB,EAChD,WAAW,EAAE,qBAAqB,EAClC,OAAO,EAAE,OAAO,GAAG,IAAI,EACvB,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,CAoFZ;AAED;;GAEG;AACH,wBAAgB,wCAAwC,CACtD,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,iBAAiB,EAC1B,WAAW,EAAE,IAAI,EACjB,gBAAgB,EAAE,gBAAgB,EAClC,IAAI,EAAE,cAAc,EACpB,uBAAuB,EAAE,uBAAuB,EAChD,WAAW,EAAE,qBAAqB,EAClC,OAAO,EAAE,OAAO,GAAG,IAAI,EACvB,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,CAyIZ"}
|
|
@@ -42,6 +42,7 @@ export function initializeForkChoiceFromFinalizedState(config, emitter, currentS
|
|
|
42
42
|
onJustified: (cp) => emitter.emit(ChainEvent.forkChoiceJustified, cp),
|
|
43
43
|
onFinalized: (cp) => emitter.emit(ChainEvent.forkChoiceFinalized, cp),
|
|
44
44
|
onFastConfirmation: ({ block, slot, currentSlot }) => emitter.emit(routes.events.EventType.fastConfirmation, { block, slot, currentSlot }),
|
|
45
|
+
onPtcQuorum: (data) => emitter.emit(ChainEvent.forkChoicePtcQuorum, data),
|
|
45
46
|
}), ProtoArray.initialize({
|
|
46
47
|
slot: blockHeader.slot,
|
|
47
48
|
parentRoot: toRootHex(blockHeader.parentRoot),
|
|
@@ -103,6 +104,7 @@ export function initializeForkChoiceFromUnfinalizedState(config, emitter, curren
|
|
|
103
104
|
onJustified: (cp) => emitter.emit(ChainEvent.forkChoiceJustified, cp),
|
|
104
105
|
onFinalized: (cp) => emitter.emit(ChainEvent.forkChoiceFinalized, cp),
|
|
105
106
|
onFastConfirmation: ({ block, slot, currentSlot }) => emitter.emit(routes.events.EventType.fastConfirmation, { block, slot, currentSlot }),
|
|
107
|
+
onPtcQuorum: (data) => emitter.emit(ChainEvent.forkChoicePtcQuorum, data),
|
|
106
108
|
});
|
|
107
109
|
// this is the same to the finalized state
|
|
108
110
|
const headBlock = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/chain/forkChoice/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/chain/forkChoice/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,8 @@ import { RootHex, Slot, ValidatorIndex, gloas } from "@lodestar/types";
|
|
|
4
4
|
*
|
|
5
5
|
* The primary consumer is `validateExecutionPayloadBid`, which looks up the matching
|
|
6
6
|
* preferences via `get(bid.slot, dependent_root)` to enforce the IGNORE-existence and
|
|
7
|
-
* REJECT-equality rules from the gloas spec. The beacon API
|
|
8
|
-
*
|
|
7
|
+
* REJECT-equality rules from the gloas spec. The beacon API `getProposerPreferences`
|
|
8
|
+
* endpoint reads from the same pool via `getAll`.
|
|
9
9
|
*
|
|
10
10
|
* `validator_index` is intentionally not part of the key: gossip validation enforces
|
|
11
11
|
* `proposers[proposalSlot % SLOTS_PER_EPOCH] === validatorIndex` against the shuffling
|
|
@@ -18,8 +18,8 @@ export declare class ProposerPreferencesPool {
|
|
|
18
18
|
get(slot: Slot, dependentRootHex: RootHex): gloas.SignedProposerPreferences | null;
|
|
19
19
|
isKnown(proposalSlot: Slot, dependentRoot: RootHex, validatorIndex: ValidatorIndex): boolean;
|
|
20
20
|
add(signed: gloas.SignedProposerPreferences): void;
|
|
21
|
-
/** API read-out: flatten across branches, optionally filtered by slot. */
|
|
22
|
-
getAll(slot?: Slot): gloas.SignedProposerPreferences[];
|
|
21
|
+
/** API read-out: flatten across branches, optionally filtered by slot and dependent root. */
|
|
22
|
+
getAll(slot?: Slot, dependentRootHex?: RootHex): gloas.SignedProposerPreferences[];
|
|
23
23
|
/**
|
|
24
24
|
* Entries are only load-bearing while `proposal_slot >= current_slot`. Once the slot has
|
|
25
25
|
* passed the `[IGNORE] proposal_slot > current_slot` gossip rule takes over, so drop them
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proposerPreferencesPool.d.ts","sourceRoot":"","sources":["../../../src/chain/opPools/proposerPreferencesPool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAC,MAAM,iBAAiB,CAAC;AAGrE;;;;;;;;;;;;GAYG;AACH,qBAAa,uBAAuB;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkE;IAEzF,0HAA0H;IAC1H,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,GAAG,KAAK,CAAC,yBAAyB,GAAG,IAAI,CAEjF;IAED,OAAO,CAAC,YAAY,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAE3F;IAED,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,yBAAyB,GAAG,IAAI,CASjD;IAED,
|
|
1
|
+
{"version":3,"file":"proposerPreferencesPool.d.ts","sourceRoot":"","sources":["../../../src/chain/opPools/proposerPreferencesPool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAC,MAAM,iBAAiB,CAAC;AAGrE;;;;;;;;;;;;GAYG;AACH,qBAAa,uBAAuB;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkE;IAEzF,0HAA0H;IAC1H,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,GAAG,KAAK,CAAC,yBAAyB,GAAG,IAAI,CAEjF;IAED,OAAO,CAAC,YAAY,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAE3F;IAED,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,yBAAyB,GAAG,IAAI,CASjD;IAED,6FAA6F;IAC7F,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,gBAAgB,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC,yBAAyB,EAAE,CAcjF;IAED;;;;OAIG;IACH,KAAK,CAAC,WAAW,EAAE,IAAI,GAAG,IAAI,CAI7B;CACF"}
|
|
@@ -4,8 +4,8 @@ import { toRootHex } from "@lodestar/utils";
|
|
|
4
4
|
*
|
|
5
5
|
* The primary consumer is `validateExecutionPayloadBid`, which looks up the matching
|
|
6
6
|
* preferences via `get(bid.slot, dependent_root)` to enforce the IGNORE-existence and
|
|
7
|
-
* REJECT-equality rules from the gloas spec. The beacon API
|
|
8
|
-
*
|
|
7
|
+
* REJECT-equality rules from the gloas spec. The beacon API `getProposerPreferences`
|
|
8
|
+
* endpoint reads from the same pool via `getAll`.
|
|
9
9
|
*
|
|
10
10
|
* `validator_index` is intentionally not part of the key: gossip validation enforces
|
|
11
11
|
* `proposers[proposalSlot % SLOTS_PER_EPOCH] === validatorIndex` against the shuffling
|
|
@@ -31,16 +31,19 @@ export class ProposerPreferencesPool {
|
|
|
31
31
|
}
|
|
32
32
|
byRoot.set(rootHex, signed);
|
|
33
33
|
}
|
|
34
|
-
/** API read-out: flatten across branches, optionally filtered by slot. */
|
|
35
|
-
getAll(slot) {
|
|
36
|
-
if (slot !== undefined) {
|
|
37
|
-
const byRoot = this.bySlot.get(slot);
|
|
38
|
-
return byRoot ? Array.from(byRoot.values()) : [];
|
|
39
|
-
}
|
|
34
|
+
/** API read-out: flatten across branches, optionally filtered by slot and dependent root. */
|
|
35
|
+
getAll(slot, dependentRootHex) {
|
|
40
36
|
const out = [];
|
|
41
|
-
for (const byRoot of this.bySlot
|
|
42
|
-
|
|
43
|
-
|
|
37
|
+
for (const [s, byRoot] of this.bySlot) {
|
|
38
|
+
if (slot !== undefined && s !== slot) {
|
|
39
|
+
continue;
|
|
40
|
+
}
|
|
41
|
+
for (const [root, signed] of byRoot) {
|
|
42
|
+
if (dependentRootHex !== undefined && root !== dependentRootHex) {
|
|
43
|
+
continue;
|
|
44
|
+
}
|
|
45
|
+
out.push(signed);
|
|
46
|
+
}
|
|
44
47
|
}
|
|
45
48
|
return out;
|
|
46
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proposerPreferencesPool.js","sourceRoot":"","sources":["../../../src/chain/opPools/proposerPreferencesPool.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAE1C;;;;;;;;;;;;GAYG;AACH,MAAM,OAAO,uBAAuB;IACjB,MAAM,GAAG,IAAI,GAAG,EAAuD,CAAC;IAEzF,0HAA0H;IAC1H,GAAG,CAAC,IAAU,EAAE,gBAAyB;QACvC,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,gBAAgB,CAAC,IAAI,IAAI,CAAC;IAC9D,CAAC;IAED,OAAO,CAAC,YAAkB,EAAE,aAAsB,EAAE,cAA8B;QAChF,OAAO,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,aAAa,CAAC,EAAE,OAAO,CAAC,cAAc,KAAK,cAAc,CAAC;IAC1F,CAAC;IAED,GAAG,CAAC,MAAuC;QACzC,MAAM,EAAC,YAAY,EAAE,aAAa,EAAC,GAAG,MAAM,CAAC,OAAO,CAAC;QACrD,MAAM,OAAO,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC;QACzC,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;YACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QACxC,CAAC;QACD,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"proposerPreferencesPool.js","sourceRoot":"","sources":["../../../src/chain/opPools/proposerPreferencesPool.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAE1C;;;;;;;;;;;;GAYG;AACH,MAAM,OAAO,uBAAuB;IACjB,MAAM,GAAG,IAAI,GAAG,EAAuD,CAAC;IAEzF,0HAA0H;IAC1H,GAAG,CAAC,IAAU,EAAE,gBAAyB;QACvC,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,gBAAgB,CAAC,IAAI,IAAI,CAAC;IAC9D,CAAC;IAED,OAAO,CAAC,YAAkB,EAAE,aAAsB,EAAE,cAA8B;QAChF,OAAO,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,aAAa,CAAC,EAAE,OAAO,CAAC,cAAc,KAAK,cAAc,CAAC;IAC1F,CAAC;IAED,GAAG,CAAC,MAAuC;QACzC,MAAM,EAAC,YAAY,EAAE,aAAa,EAAC,GAAG,MAAM,CAAC,OAAO,CAAC;QACrD,MAAM,OAAO,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC;QACzC,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;YACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QACxC,CAAC;QACD,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,6FAA6F;IAC7F,MAAM,CAAC,IAAW,EAAE,gBAA0B;QAC5C,MAAM,GAAG,GAAsC,EAAE,CAAC;QAClD,KAAK,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACtC,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;gBACrC,SAAS;YACX,CAAC;YACD,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;gBACpC,IAAI,gBAAgB,KAAK,SAAS,IAAI,IAAI,KAAK,gBAAgB,EAAE,CAAC;oBAChE,SAAS;gBACX,CAAC;gBACD,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACnB,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,WAAiB;QACrB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;YACtC,IAAI,IAAI,GAAG,WAAW;gBAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;CACF"}
|
package/lib/chain/options.d.ts
CHANGED
|
@@ -35,7 +35,7 @@ export type IChainOptions = BlockProcessOpts & PoolOpts & SeenCacheOpts & ForkCh
|
|
|
35
35
|
minSameMessageSignatureSetsToBatch: number;
|
|
36
36
|
archiveDateEpochs?: number;
|
|
37
37
|
nHistoricalStatesFileDataStore?: boolean;
|
|
38
|
-
|
|
38
|
+
nativeStateTransition?: boolean;
|
|
39
39
|
/** Builder circuit breaker fault inspection window in slots */
|
|
40
40
|
faultInspectionWindow?: number;
|
|
41
41
|
/** Canonical EMPTY blocks allowed per `faultInspectionWindow` observed blocks */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../src/chain/options.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,oBAAoB,EAAC,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAC,WAAW,EAAE,gBAAgB,EAAC,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAC,qBAAqB,EAAC,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAC,kBAAkB,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAA2B,uBAAuB,EAAC,MAAM,qCAAqC,CAAC;AACtG,OAAO,EAGL,kCAAkC,EACnC,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAC,oBAAoB,EAAC,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAC,WAAW,EAAE,oBAAoB,EAAC,CAAC;AAE3C,MAAM,MAAM,aAAa,GAAG,gBAAgB,GAC1C,QAAQ,GACR,aAAa,GACb,cAAc,GACd,gBAAgB,GAChB,uBAAuB,GACvB,kCAAkC,GAClC,kBAAkB,GAClB,oBAAoB,GACpB,qBAAqB,GAAG;IACtB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAE7B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,sGAAsG;IACtG,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,+BAA+B,CAAC,EAAE,OAAO,CAAC;IAC1C,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,6HAA6H;IAC7H,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,8DAA8D;IAC9D,+BAA+B,CAAC,EAAE,OAAO,CAAC;IAC1C,gEAAgE;IAChE,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,4FAA4F;IAC5F,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,6BAA6B,CAAC,EAAE,MAAM,CAAC;IACvC,kCAAkC,EAAE,MAAM,CAAC;IAC3C,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,8BAA8B,CAAC,EAAE,OAAO,CAAC;IACzC,
|
|
1
|
+
{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../src/chain/options.ts"],"names":[],"mappings":"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"}
|
package/lib/chain/options.js
CHANGED
|
@@ -35,7 +35,7 @@ export const defaultChainOptions = {
|
|
|
35
35
|
// - users can prune the persisted checkpoint state files manually to save disc space
|
|
36
36
|
// - it helps debug easier when network is unfinalized
|
|
37
37
|
nHistoricalStatesFileDataStore: true,
|
|
38
|
-
|
|
38
|
+
nativeStateTransition: false,
|
|
39
39
|
maxBlockStates: DEFAULT_MAX_BLOCK_STATES,
|
|
40
40
|
maxCPStateEpochsInMemory: DEFAULT_MAX_CP_STATE_EPOCHS_IN_MEMORY,
|
|
41
41
|
maxCPStateEpochsOnDisk: DEFAULT_MAX_CP_STATE_ON_DISK,
|
package/lib/chain/options.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/chain/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,IAAI,uBAAuB,EAAC,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAC,oBAAoB,EAAC,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAC,WAAW,EAAmB,MAAM,6BAA6B,CAAC;AAI1E,OAAO,EAAC,wBAAwB,EAA0B,MAAM,qCAAqC,CAAC;AACtG,OAAO,EACL,qCAAqC,EACrC,4BAA4B,GAE7B,MAAM,4CAA4C,CAAC;AAGpD,OAAO,EAAC,WAAW,EAAE,oBAAoB,EAAC,CAAC;AAwF3C,MAAM,CAAC,MAAM,mBAAmB,GAAkB;IAChD,sBAAsB,EAAE,KAAK;IAC7B,uBAAuB,EAAE,KAAK;IAC9B,iBAAiB,EAAE,EAAE;IACrB,qBAAqB,EAAE,KAAK;IAC5B,aAAa,EAAE,IAAI;IACnB,kBAAkB,EAAE,IAAI;IACxB,cAAc,EAAE,IAAI;IACpB,iBAAiB,EAAE,IAAI;IACvB,gBAAgB,EAAE,KAAK;IACvB,qBAAqB,EAAE,uBAAuB,CAAC,qBAAqB;IACpE,cAAc,EAAE,IAAI;IACpB,oBAAoB,EAAE,KAAK;IAC3B,0BAA0B,EAAE,IAAI;IAChC,WAAW,EAAE,oBAAoB;IACjC,YAAY,EAAE,KAAK;IACnB,qBAAqB,EAAE,KAAK;IAC5B,0EAA0E;IAC1E,uGAAuG;IACvG,YAAY,EAAE,EAAE;IAChB,wBAAwB,EAAE,KAAK;IAC/B,6BAA6B,EAAE,MAAM;IACrC,qEAAqE;IACrE,gGAAgG;IAChG,wGAAwG;IACxG,kCAAkC,EAAE,CAAC;IACrC,4DAA4D;IAC5D,qEAAqE;IACrE,uFAAuF;IACvF,wDAAwD;IACxD,8BAA8B,EAAE,IAAI;IACpC,
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/chain/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,IAAI,uBAAuB,EAAC,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAC,oBAAoB,EAAC,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAC,WAAW,EAAmB,MAAM,6BAA6B,CAAC;AAI1E,OAAO,EAAC,wBAAwB,EAA0B,MAAM,qCAAqC,CAAC;AACtG,OAAO,EACL,qCAAqC,EACrC,4BAA4B,GAE7B,MAAM,4CAA4C,CAAC;AAGpD,OAAO,EAAC,WAAW,EAAE,oBAAoB,EAAC,CAAC;AAwF3C,MAAM,CAAC,MAAM,mBAAmB,GAAkB;IAChD,sBAAsB,EAAE,KAAK;IAC7B,uBAAuB,EAAE,KAAK;IAC9B,iBAAiB,EAAE,EAAE;IACrB,qBAAqB,EAAE,KAAK;IAC5B,aAAa,EAAE,IAAI;IACnB,kBAAkB,EAAE,IAAI;IACxB,cAAc,EAAE,IAAI;IACpB,iBAAiB,EAAE,IAAI;IACvB,gBAAgB,EAAE,KAAK;IACvB,qBAAqB,EAAE,uBAAuB,CAAC,qBAAqB;IACpE,cAAc,EAAE,IAAI;IACpB,oBAAoB,EAAE,KAAK;IAC3B,0BAA0B,EAAE,IAAI;IAChC,WAAW,EAAE,oBAAoB;IACjC,YAAY,EAAE,KAAK;IACnB,qBAAqB,EAAE,KAAK;IAC5B,0EAA0E;IAC1E,uGAAuG;IACvG,YAAY,EAAE,EAAE;IAChB,wBAAwB,EAAE,KAAK;IAC/B,6BAA6B,EAAE,MAAM;IACrC,qEAAqE;IACrE,gGAAgG;IAChG,wGAAwG;IACxG,kCAAkC,EAAE,CAAC;IACrC,4DAA4D;IAC5D,qEAAqE;IACrE,uFAAuF;IACvF,wDAAwD;IACxD,8BAA8B,EAAE,IAAI;IACpC,qBAAqB,EAAE,KAAK;IAC5B,cAAc,EAAE,wBAAwB;IACxC,wBAAwB,EAAE,qCAAqC;IAC/D,sBAAsB,EAAE,4BAA4B;CACrD,CAAC"}
|
|
@@ -7,7 +7,7 @@ import { EMPTY_SIGNATURE, StateHashTreeRootSource } from "@lodestar/state-transi
|
|
|
7
7
|
export function computeNewStateRoot(metrics, state, block) {
|
|
8
8
|
// Set signature to zero to re-use stateTransition() function which requires the SignedBeaconBlock type
|
|
9
9
|
const signedBlock = { message: block, signature: EMPTY_SIGNATURE };
|
|
10
|
-
const { newStateRoot, proposerReward, postState, hashTreeRootTime } = state.computeNewStateRoot({ block: signedBlock }, { metrics });
|
|
10
|
+
const { newStateRoot, proposerReward, postState, hashTreeRootTime } = state.computeNewStateRoot({ block: signedBlock }, { metrics: metrics?.stateTransition });
|
|
11
11
|
metrics?.stateHashTreeRootTime.observe({ source: StateHashTreeRootSource.computeNewStateRoot }, hashTreeRootTime);
|
|
12
12
|
return { newStateRoot, proposerReward, postState };
|
|
13
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"computeNewStateRoot.js","sourceRoot":"","sources":["../../../src/chain/produceBlock/computeNewStateRoot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAoB,uBAAuB,EAAC,MAAM,4BAA4B,CAAC;AAItG;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CACjC,OAAuB,EACvB,KAAuB,EACvB,KAAuC;IAEvC,uGAAuG;IACvG,MAAM,WAAW,GAAG,EAAC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,eAAe,EAAC,CAAC;IACjE,MAAM,EAAC,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,gBAAgB,EAAC,GAAG,KAAK,CAAC,mBAAmB,CAC3F,EAAC,KAAK,EAAE,WAAW,EAAC,EACpB,EAAC,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"computeNewStateRoot.js","sourceRoot":"","sources":["../../../src/chain/produceBlock/computeNewStateRoot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAoB,uBAAuB,EAAC,MAAM,4BAA4B,CAAC;AAItG;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CACjC,OAAuB,EACvB,KAAuB,EACvB,KAAuC;IAEvC,uGAAuG;IACvG,MAAM,WAAW,GAAG,EAAC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,eAAe,EAAC,CAAC;IACjE,MAAM,EAAC,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,gBAAgB,EAAC,GAAG,KAAK,CAAC,mBAAmB,CAC3F,EAAC,KAAK,EAAE,WAAW,EAAC,EACpB,EAAC,OAAO,EAAE,OAAO,EAAE,eAAe,EAAC,CACpC,CAAC;IAEF,OAAO,EAAE,qBAAqB,CAAC,OAAO,CAAC,EAAC,MAAM,EAAE,uBAAuB,CAAC,mBAAmB,EAAC,EAAE,gBAAgB,CAAC,CAAC;IAEhH,OAAO,EAAC,YAAY,EAAE,cAAc,EAAE,SAAS,EAAC,CAAC;AACnD,CAAC"}
|
|
@@ -5,6 +5,7 @@ import { BeaconBlock, RootHex, Slot } from "@lodestar/types";
|
|
|
5
5
|
import { Logger } from "@lodestar/utils";
|
|
6
6
|
import { IBeaconDb } from "../../db/index.js";
|
|
7
7
|
import { Metrics } from "../../metrics/index.js";
|
|
8
|
+
import { SerializedCache } from "../../util/serializedCache.js";
|
|
8
9
|
import { ChainEventEmitter } from "../emitter.js";
|
|
9
10
|
import { SeenBlockInput } from "../seenCache/seenGossipBlockInput.js";
|
|
10
11
|
import { BlockStateCache, CheckpointStateCache } from "../stateCache/types.js";
|
|
@@ -16,6 +17,7 @@ export type RegenModules = {
|
|
|
16
17
|
blockStateCache: BlockStateCache;
|
|
17
18
|
checkpointStateCache: CheckpointStateCache;
|
|
18
19
|
seenBlockInputCache: SeenBlockInput;
|
|
20
|
+
serializedCache: SerializedCache;
|
|
19
21
|
config: ChainForkConfig;
|
|
20
22
|
emitter: ChainEventEmitter;
|
|
21
23
|
logger: Logger;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"regen.d.ts","sourceRoot":"","sources":["../../../src/chain/regen/regen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAC,WAAW,EAAE,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAE9D,OAAO,EAGL,gBAAgB,EAIjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAC,WAAW,EAAE,OAAO,EAAqB,IAAI,EAAC,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAC,MAAM,EAAqB,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAC,SAAS,EAAC,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAC,OAAO,EAAC,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"regen.d.ts","sourceRoot":"","sources":["../../../src/chain/regen/regen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAC,WAAW,EAAE,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAE9D,OAAO,EAGL,gBAAgB,EAIjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAC,WAAW,EAAE,OAAO,EAAqB,IAAI,EAAC,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAC,MAAM,EAAqB,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAC,SAAS,EAAC,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAC,OAAO,EAAC,MAAM,wBAAwB,CAAC;AAE/C,OAAO,EAAC,eAAe,EAAC,MAAM,+BAA+B,CAAC;AAE9D,OAAO,EAAa,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAC,cAAc,EAAC,MAAM,sCAAsC,CAAC;AACpE,OAAO,EAAC,eAAe,EAAE,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAC7E,OAAO,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAC,yBAAyB,EAAE,WAAW,EAAE,qBAAqB,EAAC,MAAM,gBAAgB,CAAC;AAE7F,MAAM,MAAM,YAAY,GAAG;IACzB,EAAE,EAAE,SAAS,CAAC;IACd,UAAU,EAAE,WAAW,CAAC;IACxB,eAAe,EAAE,eAAe,CAAC;IACjC,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,mBAAmB,EAAE,cAAc,CAAC;IACpC,eAAe,EAAE,eAAe,CAAC;IACjC,MAAM,EAAE,eAAe,CAAC;IACxB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACxB,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,CAAC;CAC3C,CAAC;AAEF;;;;;;GAMG;AACH,qBAAa,gBAAiB,YAAW,yBAAyB;IACpD,OAAO,CAAC,QAAQ,CAAC,OAAO;IAApC,YAA6B,OAAO,EAAE,YAAY,EAAI;IAEtD;;;;;OAKG;IACG,WAAW,CACf,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,qBAAqB,EAC3B,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,gBAAgB,CAAC,CAyB3B;IAED;;;OAGG;IACG,iBAAiB,CACrB,KAAK,EAAE,UAAU,EACjB,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,qBAAqB,EAC3B,WAAW,EAAE,WAAW,EACxB,eAAe,UAAQ,GACtB,OAAO,CAAC,gBAAgB,CAAC,CA4B3B;IAED;;;;OAIG;IACG,QAAQ,CACZ,SAAS,EAAE,OAAO,EAClB,MAAM,EAAE,WAAW,EAEnB,eAAe,UAAQ,GACtB,OAAO,CAAC,gBAAgB,CAAC,CAmJ3B;IAED,OAAO,CAAC,mBAAmB;CAY5B;AA+BD;;;;;;GAMG;AACH,wBAAsB,+BAA+B,CACnD,OAAO,EAAE;IACP,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACxB,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC1C,OAAO,EAAE,iBAAiB,GAAG,IAAI,CAAC;IAClC,MAAM,EAAE,eAAe,CAAC;IACxB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,EACD,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,qBAAqB,GAC1B,OAAO,CAAC,gBAAgB,CAAC,CAgE3B"}
|
package/lib/chain/regen/regen.js
CHANGED
|
@@ -171,7 +171,7 @@ export class StateRegenerator {
|
|
|
171
171
|
// Only advances state trusting block's signture and hashes.
|
|
172
172
|
// We are only running the state transition to get a specific state's data.
|
|
173
173
|
// stateTransition() does the clone() inside, transfer cache to make the regen faster
|
|
174
|
-
state = state.stateTransition(block, {
|
|
174
|
+
state = state.stateTransition({ block, ssz: this.modules.serializedCache.get(block) }, {
|
|
175
175
|
// Replay previously imported blocks, assume valid and available
|
|
176
176
|
executionPayloadStatus: ExecutionPayloadStatus.valid,
|
|
177
177
|
dataAvailabilityStatus: DataAvailabilityStatus.Available,
|
|
@@ -179,7 +179,7 @@ export class StateRegenerator {
|
|
|
179
179
|
verifyProposer: false,
|
|
180
180
|
verifySignatures: false,
|
|
181
181
|
dontTransferCache: false,
|
|
182
|
-
}, this.modules);
|
|
182
|
+
}, { metrics: this.modules.metrics?.stateTransition, validatorMonitor: this.modules.validatorMonitor });
|
|
183
183
|
const hashTreeRootTimer = this.modules.metrics?.stateHashTreeRootTime.startTimer({
|
|
184
184
|
source: StateHashTreeRootSource.regenState,
|
|
185
185
|
});
|
|
@@ -229,7 +229,10 @@ export class StateRegenerator {
|
|
|
229
229
|
async function processSlotsByCheckpoint(modules, preState, slot, regenCaller, opts) {
|
|
230
230
|
let postState = await processSlotsToNearestCheckpoint(modules, preState, slot, regenCaller, opts);
|
|
231
231
|
if (postState.slot < slot) {
|
|
232
|
-
postState = postState.processSlots(slot, opts,
|
|
232
|
+
postState = postState.processSlots(slot, opts, {
|
|
233
|
+
metrics: modules.metrics?.stateTransition,
|
|
234
|
+
validatorMonitor: modules.validatorMonitor,
|
|
235
|
+
});
|
|
233
236
|
}
|
|
234
237
|
return postState;
|
|
235
238
|
}
|
|
@@ -255,7 +258,10 @@ export async function processSlotsToNearestCheckpoint(modules, preState, slot, r
|
|
|
255
258
|
caller: regenCaller,
|
|
256
259
|
});
|
|
257
260
|
// processSlots calls .clone() before mutating
|
|
258
|
-
postState = postState.processSlots(nextEpochSlot, opts,
|
|
261
|
+
postState = postState.processSlots(nextEpochSlot, opts, {
|
|
262
|
+
metrics: metrics?.stateTransition,
|
|
263
|
+
validatorMonitor: modules.validatorMonitor,
|
|
264
|
+
});
|
|
259
265
|
metrics?.epochTransitionByCaller.inc({ caller: regenCaller });
|
|
260
266
|
// this is usually added when we prepare for next slot or validate gossip block
|
|
261
267
|
// then when we process the 1st block of epoch, we don't have to do state transition again
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"regen.js","sourceRoot":"","sources":["../../../src/chain/regen/regen.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EAEtB,uBAAuB,EACvB,kBAAkB,EAClB,uBAAuB,GACxB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAS,OAAO,EAAE,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAG3D,OAAO,EAAC,aAAa,EAAC,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"regen.js","sourceRoot":"","sources":["../../../src/chain/regen/regen.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EAEtB,uBAAuB,EACvB,kBAAkB,EAClB,uBAAuB,GACxB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAS,OAAO,EAAE,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAG3D,OAAO,EAAC,aAAa,EAAC,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAC,sBAAsB,EAAC,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAC,UAAU,EAAoB,MAAM,eAAe,CAAC;AAI5D,OAAO,EAAC,UAAU,EAAE,cAAc,EAAC,MAAM,aAAa,CAAC;AAiBvD;;;;;;GAMG;AACH,MAAM,OAAO,gBAAgB;IACE,OAAO;IAApC,YAA6B,OAAqB;uBAArB,OAAO;IAAiB,CAAC;IAEtD;;;;;OAKG;IACH,KAAK,CAAC,WAAW,CACf,KAAkB,EAClB,IAA2B,EAC3B,WAAwB;QAExB,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC/C,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;QACjF,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,UAAU,CAAC;gBACnB,IAAI,EAAE,cAAc,CAAC,uBAAuB;gBAC5C,SAAS,EAAE,KAAK,CAAC,UAAU;aAC5B,CAAC,CAAC;QACL,CAAC;QAED,MAAM,WAAW,GAAG,kBAAkB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACzD,MAAM,UAAU,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,eAAe,GAAG,IAAI,CAAC;QAE7B,kDAAkD;QAClD,mDAAmD;QACnD,wDAAwD;QACxD,sFAAsF;QACtF,6BAA6B;QAC7B,IAAI,WAAW,GAAG,UAAU,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;QAC7F,CAAC;QAED,qCAAqC;QACrC,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,SAAS,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;IAC5E,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,iBAAiB,CACrB,KAAiB,EACjB,IAAU,EACV,IAA2B,EAC3B,WAAwB,EACxB,eAAe,GAAG,KAAK;QAEvB,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;YACtB,MAAM,IAAI,UAAU,CAAC;gBACnB,IAAI,EAAE,cAAc,CAAC,sBAAsB;gBAC3C,IAAI;gBACJ,SAAS,EAAE,KAAK,CAAC,IAAI;aACtB,CAAC,CAAC;QACL,CAAC;QAED,MAAM,EAAC,SAAS,EAAC,GAAG,KAAK,CAAC;QAC1B,MAAM,EAAC,oBAAoB,EAAC,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5C,MAAM,KAAK,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAEvC,MAAM,wBAAwB,GAAG,eAAe;YAC9C,CAAC,CAAC,MAAM,oBAAoB,CAAC,iBAAiB,CAAC,SAAS,EAAE,KAAK,CAAC;YAChE,CAAC,CAAC,oBAAoB,CAAC,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAErD,+FAA+F;QAC/F,mEAAmE;QACnE,IAAI,wBAAwB,EAAE,CAAC;YAC7B,OAAO,wBAAwB,CAAC,IAAI,CAAC,OAAO,EAAE,wBAAwB,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;QACnG,CAAC;QAED,wFAAwF;QACxF,yBAAyB;QACzB,qDAAqD;QACrD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;QACzF,OAAO,wBAAwB,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;IACxF,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,QAAQ,CACZ,SAAkB,EAClB,MAAmB;IACnB,2DAA2D;IAC3D,eAAe,GAAG,KAAK;QAEvB,qDAAqD;QACrD,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACnE,IAAI,cAAc,EAAE,CAAC;YACnB,OAAO,cAAc,CAAC;QACxB,CAAC;QAED,kFAAkF;QAClF,6BAA6B;QAC7B,sDAAsD;QACtD,MAAM,KAAK,GAAG,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;QAElD,8CAA8C;QAC9C,8BAA8B;QAC9B,MAAM,cAAc,GAAG,CAAC,KAAK,CAAC,CAAC;QAC/B,IAAI,KAAK,GAA4B,IAAI,CAAC;QAC1C,MAAM,EAAC,oBAAoB,EAAC,GAAG,IAAI,CAAC,OAAO,CAAC;QAE5C,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,YAAY,CAAC,UAAU,CAAC,EAAC,MAAM,EAAC,CAAC,CAAC;QAChG,2EAA2E;QAC3E,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,qBAAqB,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC;YACpG,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YACtD,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM;YACR,CAAC;YACD,MAAM,iBAAiB,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAChD,IAAI,CAAC,iBAAiB;gBAAE,SAAS;YACjC,MAAM,KAAK,GAAG,kBAAkB,CAAC,iBAAiB,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;YAE7D,KAAK,GAAG,eAAe;gBACrB,CAAC,CAAC,MAAM,oBAAoB,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC;gBAClE,CAAC,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;YACvD,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM;YACR,CAAC;YACD,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC;QACD,iBAAiB,EAAE,EAAE,CAAC;QAEtB,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACnB,MAAM,IAAI,UAAU,CAAC;gBACnB,IAAI,EAAE,cAAc,CAAC,aAAa;aACnC,CAAC,CAAC;QACL,CAAC;QAED,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC;QACzC,MAAM,oBAAoB,GAAG,CAAC,CAAC;QAC/B,IAAI,UAAU,GAAG,oBAAoB,GAAG,eAAe,EAAE,CAAC;YACxD,MAAM,IAAI,UAAU,CAAC;gBACnB,IAAI,EAAE,cAAc,CAAC,wBAAwB;gBAC7C,SAAS;aACV,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,EAAC,MAAM,EAAC,EAAE,UAAU,CAAC,CAAC;QAE7E,MAAM,WAAW,GAAG,IAAI,KAAK,CAAO,UAAU,CAAC,CAAC;QAChD,MAAM,aAAa,GAAG,IAAI,KAAK,CAAoC,UAAU,CAAC,CAAC;QAE/E,MAAM,cAAc,GAAG,cAAc,CAAC,OAAO,EAAE,CAAC;QAChD,KAAK,MAAM,CAAC,CAAC,EAAE,UAAU,CAAC,IAAI,cAAc,CAAC,OAAO,EAAE,EAAE,CAAC;YACvD,WAAW,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC;YACjC,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YAC9E,aAAa,CAAC,CAAC,CAAC,GAAG,UAAU,EAAE,QAAQ,EAAE;gBACvC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;gBACxC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;QAC/D,CAAC;QAED,MAAM,MAAM,GAAG,EAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAC,CAAC;QACvE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,EAAE,MAAM,CAAC,CAAC;QAEnE,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,UAAU,CAAC,UAAU,CAAC,EAAC,MAAM,EAAC,CAAC,CAAC;QAC5F,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACtD,eAAe,EAAE,EAAE,CAAC;QAEpB,MAAM,YAAY,GAAG,IAAI,GAAG,EAA8B,CAAC;QAC3D,KAAK,MAAM,CAAC,CAAC,EAAE,WAAW,CAAC,IAAI,YAAY,CAAC,OAAO,EAAE,EAAE,CAAC;YACtD,wEAAwE;YACxE,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;gBACzB,MAAM,IAAI,UAAU,CAAC;oBACnB,IAAI,EAAE,cAAc,CAAC,eAAe;oBACpC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS;iBACvC,CAAC,CAAC;YACL,CAAC;YACD,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAC7D,CAAC;QAED,MAAM,oBAAoB,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,eAAe,CAAC,UAAU,CAAC,EAAC,MAAM,EAAC,CAAC,CAAC;QACtG,KAAK,MAAM,CAAC,IAAI,cAAc,EAAE,CAAC;YAC/B,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YAC5C,wEAAwE;YACxE,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,MAAM,IAAI,UAAU,CAAC;oBACnB,IAAI,EAAE,cAAc,CAAC,eAAe;oBACpC,SAAS,EAAE,CAAC,CAAC,SAAS;iBACvB,CAAC,CAAC;YACL,CAAC;YAED,IAAI,CAAC;gBACH,4DAA4D;gBAC5D,2EAA2E;gBAC3E,qFAAqF;gBACrF,KAAK,GAAG,KAAK,CAAC,eAAe,CAC3B,EAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,EAAC,EACrD;oBACE,gEAAgE;oBAChE,sBAAsB,EAAE,sBAAsB,CAAC,KAAK;oBACpD,sBAAsB,EAAE,sBAAsB,CAAC,SAAS;oBACxD,eAAe,EAAE,KAAK;oBACtB,cAAc,EAAE,KAAK;oBACrB,gBAAgB,EAAE,KAAK;oBACvB,iBAAiB,EAAE,KAAK;iBACzB,EACD,EAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAC,CAClG,CAAC;gBAEF,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,qBAAqB,CAAC,UAAU,CAAC;oBAC/E,MAAM,EAAE,uBAAuB,CAAC,UAAU;iBAC3C,CAAC,CAAC;gBACH,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;gBAClD,iBAAiB,EAAE,EAAE,CAAC;gBAEtB,IAAI,CAAC,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;oBAC9B,MAAM,IAAI,UAAU,CAAC;wBACnB,IAAI,EAAE,CAAC,CAAC,IAAI;wBACZ,IAAI,EAAE,cAAc,CAAC,kBAAkB;wBACvC,MAAM,EAAE,SAAS;wBACjB,QAAQ,EAAE,CAAC,CAAC,SAAS;qBACtB,CAAC,CAAC;gBACL,CAAC;gBAED,IAAI,eAAe,EAAE,CAAC;oBACpB,wEAAwE;oBACxE,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBAC1C,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,IAAI,UAAU,CAAC;oBACnB,IAAI,EAAE,cAAc,CAAC,sBAAsB;oBAC3C,KAAK,EAAE,CAAU;iBAClB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,oBAAoB,EAAE,EAAE,CAAC;QAEzB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,EAAC,GAAG,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,IAAI,EAAC,CAAC,CAAC;QAE9F,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,mBAAmB,CAAC,SAAkB;QAC5C,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,4BAA4B,EAAE,EAAE,CAAC;YAC3E,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;gBAClC,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAED,MAAM,IAAI,UAAU,CAAC;YACnB,IAAI,EAAE,cAAc,CAAC,uBAAuB;YAC5C,SAAS;SACV,CAAC,CAAC;IACL,CAAC;CACF;AAED;;;;GAIG;AACH,KAAK,UAAU,wBAAwB,CACrC,OAOC,EACD,QAA0B,EAC1B,IAAU,EACV,WAAwB,EACxB,IAA2B;IAE3B,IAAI,SAAS,GAAG,MAAM,+BAA+B,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;IAClG,IAAI,SAAS,CAAC,IAAI,GAAG,IAAI,EAAE,CAAC;QAC1B,SAAS,GAAG,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE;YAC7C,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,eAAe;YACzC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;SAC3C,CAAC,CAAC;IACL,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,+BAA+B,CACnD,OAOC,EACD,QAA0B,EAC1B,IAAU,EACV,WAAwB,EACxB,IAA2B;IAE3B,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC;IACtB,MAAM,QAAQ,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAC7C,IAAI,SAAS,GAAG,QAAQ,CAAC;IACzB,MAAM,EAAC,oBAAoB,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAC,GAAG,OAAO,CAAC;IACjE,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,KACE,IAAI,aAAa,GAAG,uBAAuB,CAAC,QAAQ,GAAG,CAAC,CAAC,EACzD,aAAa,IAAI,QAAQ,EACzB,aAAa,IAAI,eAAe,EAChC,CAAC;QACD,MAAM,EAAE,OAAO,CAAC,8BAA8B,EAAE;YAC9C,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,aAAa;YACb,QAAQ;YACR,MAAM,EAAE,WAAW;SACpB,CAAC,CAAC;QACH,8CAA8C;QAC9C,SAAS,GAAG,SAAS,CAAC,YAAY,CAAC,aAAa,EAAE,IAAI,EAAE;YACtD,OAAO,EAAE,OAAO,EAAE,eAAe;YACjC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;SAC3C,CAAC,CAAC;QACH,OAAO,EAAE,uBAAuB,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,WAAW,EAAC,CAAC,CAAC;QAE5D,+EAA+E;QAC/E,0FAA0F;QAC1F,yEAAyE;QACzE,wFAAwF;QACxF,MAAM,eAAe,GAAG,SAAS,CAAC;QAClC,MAAM,EAAE,GAAG,sBAAsB,CAAC,eAAe,CAAC,CAAC;QACnD,oBAAoB,CAAC,GAAG,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC;QAC9C,yCAAyC;QACzC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,EAAE,EAAE,eAAe,CAAC,CAAC;QAE1D,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;YACf,mEAAmE;YACnE,+HAA+H;YAC/H,2GAA2G;YAC3G,sHAAsH;YACtH,oEAAoE;YACpE,MAAM,cAAc,GAAG,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;YAC1C,IAAI,CAAC;gBACH,MAAM,YAAY,GAAG,MAAM,oBAAoB,CAAC,YAAY,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;gBAC9F,MAAM,EAAE,OAAO,CAAC,qEAAqE,EAAE;oBACrF,IAAI,EAAE,cAAc;oBACpB,KAAK,EAAE,EAAE,CAAC,KAAK;oBACf,YAAY;iBACb,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,EAAE,KAAK,CACX,yDAAyD,EACzD,EAAC,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,EAAC,EACvC,CAAU,CACX,CAAC;YACJ,CAAC;QACH,CAAC;QACD,KAAK,EAAE,CAAC;QAER,sDAAsD;QACtD,MAAM,aAAa,EAAE,CAAC;IACxB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -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
|
}),
|