@lodestar/fork-choice 1.44.0-rc.2 → 1.44.0
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/forkChoice/fastConfirmation/fastConfirmationRule.d.ts.map +1 -1
- package/lib/forkChoice/fastConfirmation/fastConfirmationRule.js +2 -1
- package/lib/forkChoice/fastConfirmation/fastConfirmationRule.js.map +1 -1
- package/lib/forkChoice/fastConfirmation/rules.d.ts.map +1 -1
- package/lib/forkChoice/fastConfirmation/rules.js +10 -6
- package/lib/forkChoice/fastConfirmation/rules.js.map +1 -1
- package/lib/forkChoice/fastConfirmation/types.d.ts +6 -0
- package/lib/forkChoice/fastConfirmation/types.d.ts.map +1 -1
- package/lib/forkChoice/fastConfirmation/types.js +10 -0
- package/lib/forkChoice/fastConfirmation/types.js.map +1 -1
- package/package.json +7 -7
- package/src/forkChoice/fastConfirmation/fastConfirmationRule.ts +3 -2
- package/src/forkChoice/fastConfirmation/rules.ts +10 -5
- package/src/forkChoice/fastConfirmation/types.ts +17 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fastConfirmationRule.d.ts","sourceRoot":"","sources":["../../../src/forkChoice/fastConfirmation/fastConfirmationRule.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAC,MAAM,EAAuB,MAAM,iBAAiB,CAAC;AAE7D,OAAO,EAAC,uBAAuB,EAAwB,MAAM,cAAc,CAAC;AAE5E,OAAO,EACL,uBAAuB,EACvB,sBAAsB,EAEtB,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,YAAY,CAAC;AAEpB,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAE3B,qBAAa,oBAAqB,YAAW,qBAAqB;IAE9D,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,QAAQ,CAAC,OAAO,EAAE,uBAAuB,GAAG,IAAI;IAChD,QAAQ,CAAC,MAAM,CAAC;IAHlB,YACmB,KAAK,EAAE,sBAAsB,EACrC,OAAO,EAAE,uBAAuB,GAAG,IAAI,EACvC,MAAM,CAAC,oBAAQ,EACtB;IAEJ,gBAAgB,IAAI,OAAO,CAE1B;IAED,uCAAuC,CAAC,GAAG,EAAE,uBAAuB,GAAG,sBAAsB,
|
|
1
|
+
{"version":3,"file":"fastConfirmationRule.d.ts","sourceRoot":"","sources":["../../../src/forkChoice/fastConfirmation/fastConfirmationRule.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAC,MAAM,EAAuB,MAAM,iBAAiB,CAAC;AAE7D,OAAO,EAAC,uBAAuB,EAAwB,MAAM,cAAc,CAAC;AAE5E,OAAO,EACL,uBAAuB,EACvB,sBAAsB,EAEtB,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,YAAY,CAAC;AAEpB,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAE3B,qBAAa,oBAAqB,YAAW,qBAAqB;IAE9D,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,QAAQ,CAAC,OAAO,EAAE,uBAAuB,GAAG,IAAI;IAChD,QAAQ,CAAC,MAAM,CAAC;IAHlB,YACmB,KAAK,EAAE,sBAAsB,EACrC,OAAO,EAAE,uBAAuB,GAAG,IAAI,EACvC,MAAM,CAAC,oBAAQ,EACtB;IAEJ,gBAAgB,IAAI,OAAO,CAE1B;IAED,uCAAuC,CAAC,GAAG,EAAE,uBAAuB,GAAG,sBAAsB,CAsE5F;IAED,OAAO,CAAC,+BAA+B;IAgDvC,OAAO,CAAC,6BAA6B;CAwBtC"}
|
|
@@ -42,7 +42,7 @@ export class FastConfirmationRule {
|
|
|
42
42
|
observedJustifiedRoot: snapshot.observedJustified.rootHex,
|
|
43
43
|
observedJustifiedEpoch: snapshot.observedJustified.epoch,
|
|
44
44
|
});
|
|
45
|
-
const { confirmedRoot, didReset, reason, didReorg, didFallback, didRestart } = withObservedDuration(this.metrics?.fastConfirmation.stepsDuration.startTimer({ step: FastConfirmationSteps.runRules }), () => runFastConfirmationRules(snapshot, ctx, this.store, cache, this.logger));
|
|
45
|
+
const { confirmedRoot, didReset, reason, resetReason, didReorg, didFallback, didRestart } = withObservedDuration(this.metrics?.fastConfirmation.stepsDuration.startTimer({ step: FastConfirmationSteps.runRules }), () => runFastConfirmationRules(snapshot, ctx, this.store, cache, this.logger));
|
|
46
46
|
const changed = confirmedRoot !== previousConfirmedRoot;
|
|
47
47
|
const confirmedBlock = cache.blockByRoot.get(confirmedRoot) ?? null;
|
|
48
48
|
const confirmedSlot = confirmedBlock?.slot ?? null;
|
|
@@ -53,6 +53,7 @@ export class FastConfirmationRule {
|
|
|
53
53
|
changed,
|
|
54
54
|
didReset,
|
|
55
55
|
reason,
|
|
56
|
+
resetReason,
|
|
56
57
|
confirmedSlot,
|
|
57
58
|
confirmedEpoch,
|
|
58
59
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fastConfirmationRule.js","sourceRoot":"","sources":["../../../src/forkChoice/fastConfirmation/fastConfirmationRule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAE,kBAAkB,EAAC,MAAM,4BAA4B,CAAC;AAElF,OAAO,EAAS,oBAAoB,EAAC,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAC,6BAA6B,EAAE,2BAA2B,EAAC,MAAM,WAAW,CAAC;AACrF,OAAO,EAA0B,qBAAqB,EAAC,MAAM,cAAc,CAAC;AAC5E,OAAO,EAAC,wBAAwB,EAAC,MAAM,YAAY,CAAC;AASpD,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAE3B,MAAM,OAAO,oBAAoB;IAEZ,KAAK;IACb,OAAO;IACP,MAAM;IAHjB,YACmB,KAA6B,EACrC,OAAuC,EACvC,MAAe,EACxB;qBAHiB,KAAK;uBACb,OAAO;sBACP,MAAM;IACd,CAAC;IAEJ,gBAAgB,GAAY;QAC1B,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;IAAA,CACjC;IAED,uCAAuC,CAAC,GAA4B,EAA0B;QAC5F,MAAM,WAAW,GAAG,GAAG,CAAC,cAAc,EAAE,CAAC;QACzC,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;QAEvD,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,gCAAgC,EAAE;YACnD,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE,kBAAkB,CAAC,WAAW,CAAC;SACvC,CAAC,CAAC;QACH,IAAI,CAAC,+BAA+B,CAAC,GAAG,CAAC,CAAC;QAE1C,MAAM,KAAK,GAAG,oBAAoB,CAChC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,aAAa,CAAC,UAAU,CAAC;YACtD,IAAI,EAAE,qBAAqB,CAAC,UAAU;SACvC,CAAC,EACF,2BAA2B,CAC5B,CAAC;QAEF,MAAM,QAAQ,GAAG,oBAAoB,CACnC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,aAAa,CAAC,UAAU,CAAC;YACtD,IAAI,EAAE,qBAAqB,CAAC,aAAa;SAC1C,CAAC,EACF,GAAG,EAAE,CAAC,6BAA6B,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAC5D,CAAC;QAEF,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,kCAAkC,EAAE;YACvD,aAAa,EAAE,QAAQ,CAAC,aAAa;YACrC,cAAc,EAAE,QAAQ,CAAC,cAAc;YACvC,aAAa,EAAE,QAAQ,CAAC,aAAa;YACrC,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,aAAa,EAAE,QAAQ,CAAC,aAAa;YACrC,kBAAkB,EAAE,QAAQ,CAAC,cAAc,EAAE,OAAO;YACpD,mBAAmB,EAAE,QAAQ,CAAC,cAAc,EAAE,KAAK;YACnD,qBAAqB,EAAE,QAAQ,CAAC,iBAAiB,CAAC,OAAO;YACzD,sBAAsB,EAAE,QAAQ,CAAC,iBAAiB,CAAC,KAAK;SACzD,CAAC,CAAC;QAEH,MAAM,EAAC,aAAa,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAC,GAAG,oBAAoB,
|
|
1
|
+
{"version":3,"file":"fastConfirmationRule.js","sourceRoot":"","sources":["../../../src/forkChoice/fastConfirmation/fastConfirmationRule.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rules.d.ts","sourceRoot":"","sources":["../../../src/forkChoice/fastConfirmation/rules.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAEvC,OAAO,EACL,qBAAqB,EACrB,uBAAuB,EAGvB,oBAAoB,EACpB,yBAAyB,EACzB,wBAAwB,EACxB,sBAAsB,
|
|
1
|
+
{"version":3,"file":"rules.d.ts","sourceRoot":"","sources":["../../../src/forkChoice/fastConfirmation/rules.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAEvC,OAAO,EACL,qBAAqB,EACrB,uBAAuB,EAGvB,oBAAoB,EACpB,yBAAyB,EACzB,wBAAwB,EACxB,sBAAsB,EAEvB,MAAM,YAAY,CAAC;AAGpB,eAAO,MAAM,2BAA2B,EAAE,oBAUzC,CAAC;AAEF,eAAO,MAAM,kCAAkC,EAAE,oBA4BhD,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,oBAkBxC,CAAC;AAEF,eAAO,MAAM,kCAAkC,EAAE,oBAmBhD,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,oBAAoB,EAKzD,CAAC;AAIF,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,wBAAwB,EAClC,GAAG,EAAE,uBAAuB,EAC5B,KAAK,EAAE,sBAAsB,EAC7B,KAAK,EAAE,qBAAqB,EAC5B,MAAM,CAAC,EAAE,MAAM,GACd,yBAAyB,CAoC3B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { computeEpochAtSlot, isStartSlotOfEpoch } from "@lodestar/state-transition";
|
|
2
2
|
import { equalCheckpointWithHex } from "../store.js";
|
|
3
|
-
import { FastConfirmationDecisionReason, } from "./types.js";
|
|
3
|
+
import { FastConfirmationDecisionReason, isResetReason, } from "./types.js";
|
|
4
4
|
import { findLatestConfirmedDescendant, getBlock, isAncestor, isConfirmedChainSafe } from "./utils.js";
|
|
5
5
|
export const resetIfConfirmedUnavailable = (snapshot, ctx, _store, cache, decision) => {
|
|
6
6
|
const confirmedBlock = getBlock(ctx, cache, decision.confirmedRoot);
|
|
@@ -83,13 +83,15 @@ export function runFastConfirmationRules(snapshot, ctx, store, cache, logger) {
|
|
|
83
83
|
didReset: false,
|
|
84
84
|
reason: FastConfirmationDecisionReason.Unchanged,
|
|
85
85
|
};
|
|
86
|
-
|
|
87
|
-
// later rules (eg. a restart is followed by advancing to the latest confirmed descendant)
|
|
88
|
-
const reasons = new Set();
|
|
86
|
+
const reasonTrail = [];
|
|
89
87
|
for (const rule of FAST_CONFIRMATION_RULES) {
|
|
88
|
+
const previousDecision = decision;
|
|
90
89
|
decision = rule(snapshot, ctx, store, cache, decision, logger);
|
|
91
|
-
|
|
90
|
+
if (decision !== previousDecision && decision.reason !== FastConfirmationDecisionReason.Unchanged) {
|
|
91
|
+
reasonTrail.push(decision.reason);
|
|
92
|
+
}
|
|
92
93
|
}
|
|
94
|
+
logger?.debug("Fast confirmation rule outcomes", { reasonTrail: reasonTrail.join(",") });
|
|
93
95
|
// Detect a reorg directly from ancestry instead of the reset reason: when the confirmed block is
|
|
94
96
|
// both epoch-behind and not an ancestor of head, `resetIfBehindOrNotAncestorOrUnsafe` records
|
|
95
97
|
// `ResetBehind` (it takes precedence), so keying off `ResetNotAncestor` alone would miss reorgs
|
|
@@ -100,11 +102,13 @@ export function runFastConfirmationRules(snapshot, ctx, store, cache, logger) {
|
|
|
100
102
|
confirmedRoot: decision.confirmedRoot,
|
|
101
103
|
didReset: decision.didReset,
|
|
102
104
|
reason: decision.reason,
|
|
105
|
+
// Reset cause: the first reset-classified reason in the trail (only when an actual reset occurred).
|
|
106
|
+
resetReason: decision.didReset ? reasonTrail.find(isResetReason) : undefined,
|
|
103
107
|
didReorg,
|
|
104
108
|
// A fallback is a revert to finality: a reset whose final confirmed root is the finalized
|
|
105
109
|
// checkpoint. A later rule may advance the confirmed root forward, which is not a fallback.
|
|
106
110
|
didFallback: decision.didReset && decision.confirmedRoot === snapshot.finalizedRoot,
|
|
107
|
-
didRestart:
|
|
111
|
+
didRestart: reasonTrail.includes(FastConfirmationDecisionReason.ObservedJustified),
|
|
108
112
|
};
|
|
109
113
|
}
|
|
110
114
|
//# sourceMappingURL=rules.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rules.js","sourceRoot":"","sources":["../../../src/forkChoice/fastConfirmation/rules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAE,kBAAkB,EAAC,MAAM,4BAA4B,CAAC;AAElF,OAAO,EAAC,sBAAsB,EAAC,MAAM,aAAa,CAAC;AACnD,OAAO,EAIL,8BAA8B,
|
|
1
|
+
{"version":3,"file":"rules.js","sourceRoot":"","sources":["../../../src/forkChoice/fastConfirmation/rules.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,12 +53,18 @@ export declare enum FastConfirmationDecisionReason {
|
|
|
53
53
|
ObservedJustified = "observed_justified",
|
|
54
54
|
ConfirmedDescendant = "confirmed_descendant"
|
|
55
55
|
}
|
|
56
|
+
export declare function isResetReason(reason: FastConfirmationDecisionReason): boolean;
|
|
56
57
|
export type FastConfirmationDecision = {
|
|
57
58
|
confirmedRoot: RootHex;
|
|
58
59
|
didReset: boolean;
|
|
59
60
|
reason: FastConfirmationDecisionReason;
|
|
60
61
|
};
|
|
61
62
|
export type FastConfirmationRunResult = FastConfirmationDecision & {
|
|
63
|
+
/**
|
|
64
|
+
* Cause of the reset, when one occurred.
|
|
65
|
+
* The `reason` attribute reports the final disposition and can be different.
|
|
66
|
+
*/
|
|
67
|
+
resetReason?: FastConfirmationDecisionReason;
|
|
62
68
|
/** Confirmed block became non-canonical (no longer an ancestor of head) */
|
|
63
69
|
didReorg: boolean;
|
|
64
70
|
/** Confirmed block reverted to the finalized checkpoint */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/forkChoice/fastConfirmation/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,0BAA0B,EAAE,gBAAgB,EAAC,MAAM,4BAA4B,CAAC;AACxF,OAAO,EAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAC,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAC,MAAM,EAAC,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAC,UAAU,EAAC,MAAM,+BAA+B,CAAC;AACzD,OAAO,EAAC,iBAAiB,EAAC,MAAM,aAAa,CAAC;AAE9C,MAAM,MAAM,6BAA6B,GAAG;IAC1C,KAAK,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC/B,QAAQ,EAAE,0BAA0B,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,CAClC,IAAI,EAAE;IAAC,SAAS,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,KAAK,CAAA;CAAC,GAAG;IAAC,SAAS,CAAC,EAAE,KAAK,CAAC;IAAC,UAAU,EAAE,iBAAiB,CAAA;CAAC,KAChG,gBAAgB,GAAG,IAAI,CAAC;AAE7B,KAAK,0BAA0B,GAAG;IAChC,aAAa,EAAE,OAAO,CAAC;IACvB,wCAAwC,EAAE,iBAAiB,CAAC;IAC5D,uCAAuC,EAAE,iBAAiB,CAAC;IAC3D,yCAAyC,EAAE,iBAAiB,CAAC;IAC7D,gBAAgB,EAAE,OAAO,CAAC;IAC1B,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,KAAK,yBAAyB,GAAG;IAC/B,sCAAsC,EAAE,0BAA0B,CAAC;IACnE,qCAAqC,EAAE,0BAA0B,CAAC;IAClE,uCAAuC,EAAE,0BAA0B,CAAC;IACpE,WAAW,EAAE,qBAAqB,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,0BAA0B,GAAG,yBAAyB,CAAC;AAE5F,MAAM,MAAM,sBAAsB,GAAG;IACnC,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,WAAW,EAAE,IAAI,CAAC;IAClB,YAAY,EAAE,KAAK,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,aAAa,EAAE,OAAO,CAAC;IACvB,cAAc,EAAE,KAAK,GAAG,IAAI,CAAC;IAC7B,aAAa,EAAE,IAAI,GAAG,IAAI,CAAC;IAC3B,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,cAAc,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACzC,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,oBAAY,8BAA8B;IACxC,SAAS,cAAc;IACvB,iBAAiB,wBAAwB;IACzC,WAAW,iBAAiB;IAC5B,gBAAgB,uBAAuB;IACvC,gBAAgB,uBAAuB;IACvC,iBAAiB,uBAAuB;IACxC,mBAAmB,yBAAyB;CAC7C;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,8BAA8B,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG,wBAAwB,GAAG;IACjE,2EAA2E;IAC3E,QAAQ,EAAE,OAAO,CAAC;IAClB,2DAA2D;IAC3D,WAAW,EAAE,OAAO,CAAC;IACrB,+EAA+E;IAC/E,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,CACjC,QAAQ,EAAE,wBAAwB,EAClC,GAAG,EAAE,uBAAuB,EAC5B,KAAK,EAAE,sBAAsB,EAC7B,KAAK,EAAE,qBAAqB,EAC5B,QAAQ,EAAE,wBAAwB,EAClC,MAAM,CAAC,EAAE,MAAM,KACZ,wBAAwB,CAAC;AAE9B,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG,UAAU,CAAC;AAGtD,MAAM,MAAM,qBAAqB,GAAG;IAClC,WAAW,EAAE,GAAG,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI,CAAC,CAAC;IAC7C,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IAC7C,eAAe,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC;IAChD,sBAAsB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7C,kDAAkD;IAClD,kBAAkB,EAAE,GAAG,CAAC,gBAAgB,EAAE,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;IAChE,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,iBAAiB,CAAC,EAAE,gBAAgB,CAAC;IACrC,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAAC,CAAC;CAC5D,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,MAAM,EAAE;QACN,gCAAgC,EAAE,MAAM,CAAC;QACzC,oBAAoB,EAAE,MAAM,CAAC;KAC9B,CAAC;IACF,cAAc,IAAI,IAAI,CAAC;IACvB,OAAO,IAAI,UAAU,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,OAAO,GAAG,UAAU,GAAG,IAAI,CAAC;IAC3C,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC;IAChD,YAAY,CAAC,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC;IAC9D,gBAAgB,CAAC,cAAc,EAAE,cAAc,GAAG;QAAC,IAAI,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAC,GAAG,IAAI,CAAC;IACvF,sBAAsB,IAAI;QAAC,UAAU,EAAE,iBAAiB,CAAC;QAAC,QAAQ,EAAE,0BAA0B,CAAA;KAAC,CAAC;IAChG,sBAAsB,IAAI,iBAAiB,CAAC;IAC5C,sBAAsB,IAAI,GAAG,CAAC,cAAc,CAAC,CAAC;IAC9C,oBAAoB,IAAI,MAAM,CAAC;CAChC,CAAC;AAEF,MAAM,WAAW,qBAAqB;IACpC,gBAAgB,IAAI,OAAO,CAAC;IAC5B,uCAAuC,CAAC,GAAG,EAAE,uBAAuB,GAAG,sBAAsB,CAAC;CAC/F"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/forkChoice/fastConfirmation/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,4 +9,14 @@ var FastConfirmationDecisionReason;
|
|
|
9
9
|
FastConfirmationDecisionReason["ObservedJustified"] = "observed_justified";
|
|
10
10
|
FastConfirmationDecisionReason["ConfirmedDescendant"] = "confirmed_descendant";
|
|
11
11
|
})(FastConfirmationDecisionReason || (FastConfirmationDecisionReason = {}));
|
|
12
|
+
/** Reasons where the confirmed root is pulled backward (a reset), as opposed to advanced forward. */
|
|
13
|
+
const RESET_REASONS = new Set([
|
|
14
|
+
FastConfirmationDecisionReason.ConfirmedNotFound,
|
|
15
|
+
FastConfirmationDecisionReason.ResetBehind,
|
|
16
|
+
FastConfirmationDecisionReason.ResetNotAncestor,
|
|
17
|
+
FastConfirmationDecisionReason.ResetChainUnsafe,
|
|
18
|
+
]);
|
|
19
|
+
export function isResetReason(reason) {
|
|
20
|
+
return RESET_REASONS.has(reason);
|
|
21
|
+
}
|
|
12
22
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/forkChoice/fastConfirmation/types.ts"],"names":[],"mappings":"SAkDY,8BAA8B;AAA1C,IAAY,8BAQX;AARD,WAAY,8BAA8B;IACxC,yDAAuB,CAAA;IACvB,2EAAyC,CAAA;IACzC,8DAA4B,CAAA;IAC5B,yEAAuC,CAAA;IACvC,yEAAuC,CAAA;IACvC,0EAAwC,CAAA;IACxC,8EAA4C,CAAA;AAAC,CAC/C,EARY,8BAA8B,KAA9B,8BAA8B,QAQzC"}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/forkChoice/fastConfirmation/types.ts"],"names":[],"mappings":"SAkDY,8BAA8B;AAA1C,IAAY,8BAQX;AARD,WAAY,8BAA8B;IACxC,yDAAuB,CAAA;IACvB,2EAAyC,CAAA;IACzC,8DAA4B,CAAA;IAC5B,yEAAuC,CAAA;IACvC,yEAAuC,CAAA;IACvC,0EAAwC,CAAA;IACxC,8EAA4C,CAAA;AAAC,CAC/C,EARY,8BAA8B,KAA9B,8BAA8B,QAQzC;AAED,qGAAqG;AACrG,MAAM,aAAa,GAAG,IAAI,GAAG,CAAiC;IAC5D,8BAA8B,CAAC,iBAAiB;IAChD,8BAA8B,CAAC,WAAW;IAC1C,8BAA8B,CAAC,gBAAgB;IAC/C,8BAA8B,CAAC,gBAAgB;CAChD,CAAC,CAAC;AAEH,MAAM,UAAU,aAAa,CAAC,MAAsC,EAAW;IAC7E,OAAO,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AAAA,CAClC"}
|
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"bugs": {
|
|
12
12
|
"url": "https://github.com/ChainSafe/lodestar/issues"
|
|
13
13
|
},
|
|
14
|
-
"version": "1.44.0
|
|
14
|
+
"version": "1.44.0",
|
|
15
15
|
"type": "module",
|
|
16
16
|
"exports": {
|
|
17
17
|
".": {
|
|
@@ -40,11 +40,11 @@
|
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
42
|
"@chainsafe/ssz": "^1.4.0",
|
|
43
|
-
"@lodestar/config": "^1.44.0
|
|
44
|
-
"@lodestar/params": "^1.44.0
|
|
45
|
-
"@lodestar/state-transition": "^1.44.0
|
|
46
|
-
"@lodestar/types": "^1.44.0
|
|
47
|
-
"@lodestar/utils": "^1.44.0
|
|
43
|
+
"@lodestar/config": "^1.44.0",
|
|
44
|
+
"@lodestar/params": "^1.44.0",
|
|
45
|
+
"@lodestar/state-transition": "^1.44.0",
|
|
46
|
+
"@lodestar/types": "^1.44.0",
|
|
47
|
+
"@lodestar/utils": "^1.44.0"
|
|
48
48
|
},
|
|
49
49
|
"keywords": [
|
|
50
50
|
"ethereum",
|
|
@@ -52,5 +52,5 @@
|
|
|
52
52
|
"beacon",
|
|
53
53
|
"blockchain"
|
|
54
54
|
],
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "e3d733b7b5107122ff90fc89021a9ab404198c39"
|
|
56
56
|
}
|
|
@@ -62,7 +62,7 @@ export class FastConfirmationRule implements IFastConfirmationRule {
|
|
|
62
62
|
observedJustifiedEpoch: snapshot.observedJustified.epoch,
|
|
63
63
|
});
|
|
64
64
|
|
|
65
|
-
const {confirmedRoot, didReset, reason, didReorg, didFallback, didRestart} = withObservedDuration(
|
|
65
|
+
const {confirmedRoot, didReset, reason, resetReason, didReorg, didFallback, didRestart} = withObservedDuration(
|
|
66
66
|
this.metrics?.fastConfirmation.stepsDuration.startTimer({step: FastConfirmationSteps.runRules}),
|
|
67
67
|
() => runFastConfirmationRules(snapshot, ctx, this.store, cache, this.logger)
|
|
68
68
|
);
|
|
@@ -77,6 +77,7 @@ export class FastConfirmationRule implements IFastConfirmationRule {
|
|
|
77
77
|
changed,
|
|
78
78
|
didReset,
|
|
79
79
|
reason,
|
|
80
|
+
resetReason,
|
|
80
81
|
confirmedSlot,
|
|
81
82
|
confirmedEpoch,
|
|
82
83
|
};
|
|
@@ -147,7 +148,7 @@ export class FastConfirmationRule implements IFastConfirmationRule {
|
|
|
147
148
|
|
|
148
149
|
private updateFastConfirmationMetrics(
|
|
149
150
|
ctx: FastConfirmationContext,
|
|
150
|
-
result: Omit<FastConfirmationRunResult, "reason">
|
|
151
|
+
result: Omit<FastConfirmationRunResult, "reason" | "resetReason">
|
|
151
152
|
): void {
|
|
152
153
|
if (!this.metrics) return;
|
|
153
154
|
const confirmedBlock = ctx.getBlock(result.confirmedRoot);
|
|
@@ -10,6 +10,7 @@ import {
|
|
|
10
10
|
FastConfirmationRunResult,
|
|
11
11
|
FastConfirmationSnapshot,
|
|
12
12
|
IFastConfirmationStore,
|
|
13
|
+
isResetReason,
|
|
13
14
|
} from "./types.ts";
|
|
14
15
|
import {findLatestConfirmedDescendant, getBlock, isAncestor, isConfirmedChainSafe} from "./utils.ts";
|
|
15
16
|
|
|
@@ -118,13 +119,15 @@ export function runFastConfirmationRules(
|
|
|
118
119
|
reason: FastConfirmationDecisionReason.Unchanged,
|
|
119
120
|
};
|
|
120
121
|
|
|
121
|
-
|
|
122
|
-
// later rules (eg. a restart is followed by advancing to the latest confirmed descendant)
|
|
123
|
-
const reasons = new Set<FastConfirmationDecisionReason>();
|
|
122
|
+
const reasonTrail: FastConfirmationDecisionReason[] = [];
|
|
124
123
|
for (const rule of FAST_CONFIRMATION_RULES) {
|
|
124
|
+
const previousDecision = decision;
|
|
125
125
|
decision = rule(snapshot, ctx, store, cache, decision, logger);
|
|
126
|
-
|
|
126
|
+
if (decision !== previousDecision && decision.reason !== FastConfirmationDecisionReason.Unchanged) {
|
|
127
|
+
reasonTrail.push(decision.reason);
|
|
128
|
+
}
|
|
127
129
|
}
|
|
130
|
+
logger?.debug("Fast confirmation rule outcomes", {reasonTrail: reasonTrail.join(",")});
|
|
128
131
|
|
|
129
132
|
// Detect a reorg directly from ancestry instead of the reset reason: when the confirmed block is
|
|
130
133
|
// both epoch-behind and not an ancestor of head, `resetIfBehindOrNotAncestorOrUnsafe` records
|
|
@@ -137,10 +140,12 @@ export function runFastConfirmationRules(
|
|
|
137
140
|
confirmedRoot: decision.confirmedRoot,
|
|
138
141
|
didReset: decision.didReset,
|
|
139
142
|
reason: decision.reason,
|
|
143
|
+
// Reset cause: the first reset-classified reason in the trail (only when an actual reset occurred).
|
|
144
|
+
resetReason: decision.didReset ? reasonTrail.find(isResetReason) : undefined,
|
|
140
145
|
didReorg,
|
|
141
146
|
// A fallback is a revert to finality: a reset whose final confirmed root is the finalized
|
|
142
147
|
// checkpoint. A later rule may advance the confirmed root forward, which is not a fallback.
|
|
143
148
|
didFallback: decision.didReset && decision.confirmedRoot === snapshot.finalizedRoot,
|
|
144
|
-
didRestart:
|
|
149
|
+
didRestart: reasonTrail.includes(FastConfirmationDecisionReason.ObservedJustified),
|
|
145
150
|
};
|
|
146
151
|
}
|
|
@@ -58,6 +58,18 @@ export enum FastConfirmationDecisionReason {
|
|
|
58
58
|
ConfirmedDescendant = "confirmed_descendant",
|
|
59
59
|
}
|
|
60
60
|
|
|
61
|
+
/** Reasons where the confirmed root is pulled backward (a reset), as opposed to advanced forward. */
|
|
62
|
+
const RESET_REASONS = new Set<FastConfirmationDecisionReason>([
|
|
63
|
+
FastConfirmationDecisionReason.ConfirmedNotFound,
|
|
64
|
+
FastConfirmationDecisionReason.ResetBehind,
|
|
65
|
+
FastConfirmationDecisionReason.ResetNotAncestor,
|
|
66
|
+
FastConfirmationDecisionReason.ResetChainUnsafe,
|
|
67
|
+
]);
|
|
68
|
+
|
|
69
|
+
export function isResetReason(reason: FastConfirmationDecisionReason): boolean {
|
|
70
|
+
return RESET_REASONS.has(reason);
|
|
71
|
+
}
|
|
72
|
+
|
|
61
73
|
export type FastConfirmationDecision = {
|
|
62
74
|
confirmedRoot: RootHex;
|
|
63
75
|
didReset: boolean;
|
|
@@ -65,6 +77,11 @@ export type FastConfirmationDecision = {
|
|
|
65
77
|
};
|
|
66
78
|
|
|
67
79
|
export type FastConfirmationRunResult = FastConfirmationDecision & {
|
|
80
|
+
/**
|
|
81
|
+
* Cause of the reset, when one occurred.
|
|
82
|
+
* The `reason` attribute reports the final disposition and can be different.
|
|
83
|
+
*/
|
|
84
|
+
resetReason?: FastConfirmationDecisionReason;
|
|
68
85
|
/** Confirmed block became non-canonical (no longer an ancestor of head) */
|
|
69
86
|
didReorg: boolean;
|
|
70
87
|
/** Confirmed block reverted to the finalized checkpoint */
|