@lodestar/validator 1.45.0-dev.67b1b61d1b → 1.45.0-dev.85227cfbe5
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/services/emitter.d.ts +4 -0
- package/lib/services/emitter.d.ts.map +1 -1
- package/lib/services/emitter.js +18 -0
- package/lib/services/emitter.js.map +1 -1
- package/lib/services/ptc.d.ts +0 -5
- package/lib/services/ptc.d.ts.map +1 -1
- package/lib/services/ptc.js +4 -30
- package/lib/services/ptc.js.map +1 -1
- package/package.json +12 -12
- package/src/services/emitter.ts +21 -0
- package/src/services/ptc.ts +6 -33
|
@@ -29,6 +29,10 @@ export declare class ValidatorEventEmitter extends ValidatorEventEmitter_base {
|
|
|
29
29
|
* Wait for the first block to come with slot >= provided slot.
|
|
30
30
|
*/
|
|
31
31
|
waitForBlockSlot(slot: Slot): Promise<void>;
|
|
32
|
+
/**
|
|
33
|
+
* Wait for the first execution payload availability event to come with slot >= provided slot.
|
|
34
|
+
*/
|
|
35
|
+
waitForExecutionPayloadAvailableSlot(slot: Slot): Promise<void>;
|
|
32
36
|
}
|
|
33
37
|
export {};
|
|
34
38
|
//# sourceMappingURL=emitter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emitter.d.ts","sourceRoot":"","sources":["../../src/services/emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AACzC,OAAO,EAAC,kBAAkB,EAAC,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAC,IAAI,EAAC,MAAM,iBAAiB,CAAC;AACrC,OAAO,EAAC,aAAa,EAAC,MAAM,yBAAyB,CAAC;AAEtD,oBAAY,cAAc;IACxB;;OAEG;IACH,SAAS,cAAc;IACvB;;OAEG;IACH,yBAAyB,8BAA8B;CACxD;AAED,MAAM,MAAM,kCAAkC,GAAG;IAC/C,IAAI,EAAE,IAAI,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,IAAI,CAAC;IAC1D,CAAC,cAAc,CAAC,yBAAyB,CAAC,EAAE,CAAC,OAAO,EAAE,kCAAkC,KAAK,IAAI,CAAC;CACnG,CAAC;;AAEF;;GAEG;AACH,qBAAa,qBAAsB,SAAQ,0BAEzC;IACA;;OAEG;IACG,gBAAgB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBhD;CACF"}
|
|
1
|
+
{"version":3,"file":"emitter.d.ts","sourceRoot":"","sources":["../../src/services/emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AACzC,OAAO,EAAC,kBAAkB,EAAC,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAC,IAAI,EAAC,MAAM,iBAAiB,CAAC;AACrC,OAAO,EAAC,aAAa,EAAC,MAAM,yBAAyB,CAAC;AAEtD,oBAAY,cAAc;IACxB;;OAEG;IACH,SAAS,cAAc;IACvB;;OAEG;IACH,yBAAyB,8BAA8B;CACxD;AAED,MAAM,MAAM,kCAAkC,GAAG;IAC/C,IAAI,EAAE,IAAI,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,IAAI,CAAC;IAC1D,CAAC,cAAc,CAAC,yBAAyB,CAAC,EAAE,CAAC,OAAO,EAAE,kCAAkC,KAAK,IAAI,CAAC;CACnG,CAAC;;AAEF;;GAEG;AACH,qBAAa,qBAAsB,SAAQ,0BAEzC;IACA;;OAEG;IACG,gBAAgB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBhD;IAED;;OAEG;IACG,oCAAoC,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBpE;CACF"}
|
package/lib/services/emitter.js
CHANGED
|
@@ -33,5 +33,23 @@ export class ValidatorEventEmitter extends EventEmitter {
|
|
|
33
33
|
this.on(ValidatorEvent.chainHead, headListener);
|
|
34
34
|
});
|
|
35
35
|
}
|
|
36
|
+
/**
|
|
37
|
+
* Wait for the first execution payload availability event to come with slot >= provided slot.
|
|
38
|
+
*/
|
|
39
|
+
async waitForExecutionPayloadAvailableSlot(slot) {
|
|
40
|
+
let payloadListener;
|
|
41
|
+
const onDone = () => {
|
|
42
|
+
this.off(ValidatorEvent.executionPayloadAvailable, payloadListener);
|
|
43
|
+
};
|
|
44
|
+
return new Promise((resolve) => {
|
|
45
|
+
payloadListener = (payload) => {
|
|
46
|
+
if (payload.slot >= slot) {
|
|
47
|
+
onDone();
|
|
48
|
+
resolve();
|
|
49
|
+
}
|
|
50
|
+
};
|
|
51
|
+
this.on(ValidatorEvent.executionPayloadAvailable, payloadListener);
|
|
52
|
+
});
|
|
53
|
+
}
|
|
36
54
|
}
|
|
37
55
|
//# sourceMappingURL=emitter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../src/services/emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;SAK7B,cAAc;AAA1B,IAAY,cASX;AATD,WAAY,cAAc;IACxB;;OAEG;IACH,yCAAuB,CAAA;IACvB;;OAEG;IACH,yEAAuD,CAAA;AAAC,CAC1D,EATY,cAAc,KAAd,cAAc,QASzB;AAYD;;GAEG;AACH,MAAM,OAAO,qBAAsB,SAAS,YAE1C;IACA;;OAEG;IACH,KAAK,CAAC,gBAAgB,CAAC,IAAU,EAAiB;QAChD,IAAI,YAA2C,CAAC;QAEhD,MAAM,MAAM,GAAG,GAAS,EAAE,CAAC;YACzB,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QAAA,CAClD,CAAC;QAEF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;YAC9B,YAAY,GAAG,CAAC,IAAmB,EAAQ,EAAE,CAAC;gBAC5C,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;oBACtB,MAAM,EAAE,CAAC;oBACT,OAAO,EAAE,CAAC;gBACZ,CAAC;YAAA,CACF,CAAC;YACF,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QAAA,CACjD,CAAC,CAAC;IAAA,CACJ;CACF"}
|
|
1
|
+
{"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../src/services/emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;SAK7B,cAAc;AAA1B,IAAY,cASX;AATD,WAAY,cAAc;IACxB;;OAEG;IACH,yCAAuB,CAAA;IACvB;;OAEG;IACH,yEAAuD,CAAA;AAAC,CAC1D,EATY,cAAc,KAAd,cAAc,QASzB;AAYD;;GAEG;AACH,MAAM,OAAO,qBAAsB,SAAS,YAE1C;IACA;;OAEG;IACH,KAAK,CAAC,gBAAgB,CAAC,IAAU,EAAiB;QAChD,IAAI,YAA2C,CAAC;QAEhD,MAAM,MAAM,GAAG,GAAS,EAAE,CAAC;YACzB,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QAAA,CAClD,CAAC;QAEF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;YAC9B,YAAY,GAAG,CAAC,IAAmB,EAAQ,EAAE,CAAC;gBAC5C,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;oBACtB,MAAM,EAAE,CAAC;oBACT,OAAO,EAAE,CAAC;gBACZ,CAAC;YAAA,CACF,CAAC;YACF,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QAAA,CACjD,CAAC,CAAC;IAAA,CACJ;IAED;;OAEG;IACH,KAAK,CAAC,oCAAoC,CAAC,IAAU,EAAiB;QACpE,IAAI,eAAsE,CAAC;QAE3E,MAAM,MAAM,GAAG,GAAS,EAAE,CAAC;YACzB,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,yBAAyB,EAAE,eAAe,CAAC,CAAC;QAAA,CACrE,CAAC;QAEF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;YAC9B,eAAe,GAAG,CAAC,OAAO,EAAQ,EAAE,CAAC;gBACnC,IAAI,OAAO,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;oBACzB,MAAM,EAAE,CAAC;oBACT,OAAO,EAAE,CAAC;gBACZ,CAAC;YAAA,CACF,CAAC;YACF,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,yBAAyB,EAAE,eAAe,CAAC,CAAC;QAAA,CACpE,CAAC,CAAC;IAAA,CACJ;CACF"}
|
package/lib/services/ptc.d.ts
CHANGED
|
@@ -17,16 +17,11 @@ export declare class PtcService {
|
|
|
17
17
|
private readonly clock;
|
|
18
18
|
private readonly validatorStore;
|
|
19
19
|
private readonly emitter;
|
|
20
|
-
private readonly chainHeadTracker;
|
|
21
20
|
private readonly metrics;
|
|
22
21
|
private readonly dutiesService;
|
|
23
22
|
constructor(config: ChainForkConfig, logger: LoggerVc, api: ApiClient, clock: IClock, validatorStore: ValidatorStore, emitter: ValidatorEventEmitter, chainHeadTracker: ChainHeaderTracker, syncingStatusTracker: SyncingStatusTracker, metrics: Metrics | null);
|
|
24
23
|
removeDutiesForKey(pubkey: PubkeyHex): void;
|
|
25
24
|
private runPtcTasks;
|
|
26
|
-
/**
|
|
27
|
-
* Resolve when the payload for the canonical head block at `slot` is available
|
|
28
|
-
*/
|
|
29
|
-
private waitForCanonicalPayload;
|
|
30
25
|
private signAndPublishPayloadAttestations;
|
|
31
26
|
}
|
|
32
27
|
//# sourceMappingURL=ptc.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ptc.d.ts","sourceRoot":"","sources":["../../src/services/ptc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAS,MAAM,eAAe,CAAC;AAChD,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAIjD,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AACtC,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AACtC,OAAO,EAAC,MAAM,EAAE,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAC,kBAAkB,EAAC,MAAM,yBAAyB,CAAC;AAC3D,OAAO,
|
|
1
|
+
{"version":3,"file":"ptc.d.ts","sourceRoot":"","sources":["../../src/services/ptc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAS,MAAM,eAAe,CAAC;AAChD,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAIjD,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AACtC,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AACtC,OAAO,EAAC,MAAM,EAAE,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAC,kBAAkB,EAAC,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAC,qBAAqB,EAAC,MAAM,cAAc,CAAC;AAEnD,OAAO,EAAC,oBAAoB,EAAC,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAEnD;;GAEG;AACH,qBAAa,UAAU;IAInB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAGxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAX1B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAmB;IAEjD,YACmB,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,QAAQ,EAChB,GAAG,EAAE,SAAS,EACd,KAAK,EAAE,MAAM,EACb,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,qBAAqB,EAC/C,gBAAgB,EAAE,kBAAkB,EACpC,oBAAoB,EAAE,oBAAoB,EACzB,OAAO,EAAE,OAAO,GAAG,IAAI,EAczC;IAED,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAE1C;IAED,OAAO,CAAC,WAAW,CAiCjB;YAEY,iCAAiC;CAkDhD"}
|
package/lib/services/ptc.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { isForkPostGloas } from "@lodestar/params";
|
|
2
2
|
import { prettyBytes, sleep, toRootHex } from "@lodestar/utils";
|
|
3
|
-
import { ValidatorEvent } from "./emitter.js";
|
|
4
3
|
import { PtcDutiesService } from "./ptcDuties.js";
|
|
5
4
|
/**
|
|
6
5
|
* Service that sets up and handles validator Payload Timeliness Committee duties.
|
|
@@ -12,7 +11,6 @@ export class PtcService {
|
|
|
12
11
|
clock;
|
|
13
12
|
validatorStore;
|
|
14
13
|
emitter;
|
|
15
|
-
chainHeadTracker;
|
|
16
14
|
metrics;
|
|
17
15
|
dutiesService;
|
|
18
16
|
constructor(config, logger, api, clock, validatorStore, emitter, chainHeadTracker, syncingStatusTracker, metrics) {
|
|
@@ -22,7 +20,6 @@ export class PtcService {
|
|
|
22
20
|
this.clock = clock;
|
|
23
21
|
this.validatorStore = validatorStore;
|
|
24
22
|
this.emitter = emitter;
|
|
25
|
-
this.chainHeadTracker = chainHeadTracker;
|
|
26
23
|
this.metrics = metrics;
|
|
27
24
|
this.dutiesService = new PtcDutiesService(config, logger, api, clock, validatorStore, chainHeadTracker, syncingStatusTracker, metrics);
|
|
28
25
|
clock.runEverySlot(this.runPtcTasks);
|
|
@@ -40,17 +37,10 @@ export class PtcService {
|
|
|
40
37
|
return;
|
|
41
38
|
}
|
|
42
39
|
const payloadAttestationDueMs = this.config.getSlotComponentDurationMs(this.config.PAYLOAD_ATTESTATION_DUE_BPS);
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
sleep(payloadAttestationDueMs - this.clock.msFromSlot(slot), signal),
|
|
48
|
-
this.waitForCanonicalPayload(slot, payloadAvailable.signal),
|
|
49
|
-
]);
|
|
50
|
-
}
|
|
51
|
-
finally {
|
|
52
|
-
payloadAvailable.abort();
|
|
53
|
-
}
|
|
40
|
+
await Promise.race([
|
|
41
|
+
sleep(payloadAttestationDueMs - this.clock.msFromSlot(slot), signal),
|
|
42
|
+
this.emitter.waitForExecutionPayloadAvailableSlot(slot),
|
|
43
|
+
]);
|
|
54
44
|
this.metrics?.ptcStepCallProducePayloadAttestation.observe(this.clock.secFromSlot(slot) - payloadAttestationDueMs / 1000);
|
|
55
45
|
try {
|
|
56
46
|
// No canonical block at slot resolves to `undefined`
|
|
@@ -66,22 +56,6 @@ export class PtcService {
|
|
|
66
56
|
this.logger.error("Error on PTC routine", { slot }, e);
|
|
67
57
|
}
|
|
68
58
|
};
|
|
69
|
-
/**
|
|
70
|
-
* Resolve when the payload for the canonical head block at `slot` is available
|
|
71
|
-
*/
|
|
72
|
-
waitForCanonicalPayload(slot, signal) {
|
|
73
|
-
return new Promise((resolve) => {
|
|
74
|
-
const onPayloadAvailable = (payload) => {
|
|
75
|
-
const head = this.chainHeadTracker.getCurrentChainHead(slot);
|
|
76
|
-
if (payload.slot === slot && head !== null && payload.blockRoot === toRootHex(head)) {
|
|
77
|
-
this.emitter.off(ValidatorEvent.executionPayloadAvailable, onPayloadAvailable);
|
|
78
|
-
resolve();
|
|
79
|
-
}
|
|
80
|
-
};
|
|
81
|
-
signal.addEventListener("abort", () => this.emitter.off(ValidatorEvent.executionPayloadAvailable, onPayloadAvailable), { once: true });
|
|
82
|
-
this.emitter.on(ValidatorEvent.executionPayloadAvailable, onPayloadAvailable);
|
|
83
|
-
});
|
|
84
|
-
}
|
|
85
59
|
async signAndPublishPayloadAttestations(slot, payloadAttestationData, duties) {
|
|
86
60
|
const payloadAttestationMessages = [];
|
|
87
61
|
const beaconBlockRootHex = toRootHex(payloadAttestationData.beaconBlockRoot);
|
package/lib/services/ptc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ptc.js","sourceRoot":"","sources":["../../src/services/ptc.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAC,WAAW,EAAE,KAAK,EAAE,SAAS,EAAC,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"ptc.js","sourceRoot":"","sources":["../../src/services/ptc.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lodestar/validator",
|
|
3
|
-
"version": "1.45.0-dev.
|
|
3
|
+
"version": "1.45.0-dev.85227cfbe5",
|
|
4
4
|
"description": "A Typescript implementation of the validator client",
|
|
5
5
|
"author": "ChainSafe Systems",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -50,21 +50,21 @@
|
|
|
50
50
|
"dependencies": {
|
|
51
51
|
"@chainsafe/blst": "^2.2.0",
|
|
52
52
|
"@chainsafe/ssz": "^1.4.0",
|
|
53
|
-
"@lodestar/api": "^1.45.0-dev.
|
|
54
|
-
"@lodestar/config": "^1.45.0-dev.
|
|
55
|
-
"@lodestar/db": "^1.45.0-dev.
|
|
56
|
-
"@lodestar/params": "^1.45.0-dev.
|
|
57
|
-
"@lodestar/state-transition": "^1.45.0-dev.
|
|
58
|
-
"@lodestar/types": "^1.45.0-dev.
|
|
59
|
-
"@lodestar/utils": "^1.45.0-dev.
|
|
53
|
+
"@lodestar/api": "^1.45.0-dev.85227cfbe5",
|
|
54
|
+
"@lodestar/config": "^1.45.0-dev.85227cfbe5",
|
|
55
|
+
"@lodestar/db": "^1.45.0-dev.85227cfbe5",
|
|
56
|
+
"@lodestar/params": "^1.45.0-dev.85227cfbe5",
|
|
57
|
+
"@lodestar/state-transition": "^1.45.0-dev.85227cfbe5",
|
|
58
|
+
"@lodestar/types": "^1.45.0-dev.85227cfbe5",
|
|
59
|
+
"@lodestar/utils": "^1.45.0-dev.85227cfbe5",
|
|
60
60
|
"strict-event-emitter-types": "^2.0.0"
|
|
61
61
|
},
|
|
62
62
|
"devDependencies": {
|
|
63
|
-
"@lodestar/logger": "^1.45.0-dev.
|
|
64
|
-
"@lodestar/spec-test-util": "^1.45.0-dev.
|
|
65
|
-
"@lodestar/test-utils": "^1.45.0-dev.
|
|
63
|
+
"@lodestar/logger": "^1.45.0-dev.85227cfbe5",
|
|
64
|
+
"@lodestar/spec-test-util": "^1.45.0-dev.85227cfbe5",
|
|
65
|
+
"@lodestar/test-utils": "^1.45.0-dev.85227cfbe5",
|
|
66
66
|
"@vekexasia/bigint-buffer2": "^1.1.1",
|
|
67
67
|
"rimraf": "^4.4.1"
|
|
68
68
|
},
|
|
69
|
-
"gitHead": "
|
|
69
|
+
"gitHead": "bd183bff2666327a75b389254a812a5f729c836f"
|
|
70
70
|
}
|
package/src/services/emitter.ts
CHANGED
|
@@ -50,4 +50,25 @@ export class ValidatorEventEmitter extends (EventEmitter as {
|
|
|
50
50
|
this.on(ValidatorEvent.chainHead, headListener);
|
|
51
51
|
});
|
|
52
52
|
}
|
|
53
|
+
|
|
54
|
+
/**
|
|
55
|
+
* Wait for the first execution payload availability event to come with slot >= provided slot.
|
|
56
|
+
*/
|
|
57
|
+
async waitForExecutionPayloadAvailableSlot(slot: Slot): Promise<void> {
|
|
58
|
+
let payloadListener: (payload: ExecutionPayloadAvailableEventData) => void;
|
|
59
|
+
|
|
60
|
+
const onDone = (): void => {
|
|
61
|
+
this.off(ValidatorEvent.executionPayloadAvailable, payloadListener);
|
|
62
|
+
};
|
|
63
|
+
|
|
64
|
+
return new Promise((resolve) => {
|
|
65
|
+
payloadListener = (payload): void => {
|
|
66
|
+
if (payload.slot >= slot) {
|
|
67
|
+
onDone();
|
|
68
|
+
resolve();
|
|
69
|
+
}
|
|
70
|
+
};
|
|
71
|
+
this.on(ValidatorEvent.executionPayloadAvailable, payloadListener);
|
|
72
|
+
});
|
|
73
|
+
}
|
|
53
74
|
}
|
package/src/services/ptc.ts
CHANGED
|
@@ -7,7 +7,7 @@ import {Metrics} from "../metrics.js";
|
|
|
7
7
|
import {PubkeyHex} from "../types.js";
|
|
8
8
|
import {IClock, LoggerVc} from "../util/index.js";
|
|
9
9
|
import {ChainHeaderTracker} from "./chainHeaderTracker.js";
|
|
10
|
-
import {
|
|
10
|
+
import {ValidatorEventEmitter} from "./emitter.js";
|
|
11
11
|
import {PtcDutiesService} from "./ptcDuties.js";
|
|
12
12
|
import {SyncingStatusTracker} from "./syncingStatusTracker.js";
|
|
13
13
|
import {ValidatorStore} from "./validatorStore.js";
|
|
@@ -25,7 +25,7 @@ export class PtcService {
|
|
|
25
25
|
private readonly clock: IClock,
|
|
26
26
|
private readonly validatorStore: ValidatorStore,
|
|
27
27
|
private readonly emitter: ValidatorEventEmitter,
|
|
28
|
-
|
|
28
|
+
chainHeadTracker: ChainHeaderTracker,
|
|
29
29
|
syncingStatusTracker: SyncingStatusTracker,
|
|
30
30
|
private readonly metrics: Metrics | null
|
|
31
31
|
) {
|
|
@@ -59,16 +59,10 @@ export class PtcService {
|
|
|
59
59
|
}
|
|
60
60
|
|
|
61
61
|
const payloadAttestationDueMs = this.config.getSlotComponentDurationMs(this.config.PAYLOAD_ATTESTATION_DUE_BPS);
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
sleep(payloadAttestationDueMs - this.clock.msFromSlot(slot), signal),
|
|
67
|
-
this.waitForCanonicalPayload(slot, payloadAvailable.signal),
|
|
68
|
-
]);
|
|
69
|
-
} finally {
|
|
70
|
-
payloadAvailable.abort();
|
|
71
|
-
}
|
|
62
|
+
await Promise.race([
|
|
63
|
+
sleep(payloadAttestationDueMs - this.clock.msFromSlot(slot), signal),
|
|
64
|
+
this.emitter.waitForExecutionPayloadAvailableSlot(slot),
|
|
65
|
+
]);
|
|
72
66
|
|
|
73
67
|
this.metrics?.ptcStepCallProducePayloadAttestation.observe(
|
|
74
68
|
this.clock.secFromSlot(slot) - payloadAttestationDueMs / 1000
|
|
@@ -88,27 +82,6 @@ export class PtcService {
|
|
|
88
82
|
}
|
|
89
83
|
};
|
|
90
84
|
|
|
91
|
-
/**
|
|
92
|
-
* Resolve when the payload for the canonical head block at `slot` is available
|
|
93
|
-
*/
|
|
94
|
-
private waitForCanonicalPayload(slot: Slot, signal: AbortSignal): Promise<void> {
|
|
95
|
-
return new Promise((resolve) => {
|
|
96
|
-
const onPayloadAvailable = (payload: ExecutionPayloadAvailableEventData): void => {
|
|
97
|
-
const head = this.chainHeadTracker.getCurrentChainHead(slot);
|
|
98
|
-
if (payload.slot === slot && head !== null && payload.blockRoot === toRootHex(head)) {
|
|
99
|
-
this.emitter.off(ValidatorEvent.executionPayloadAvailable, onPayloadAvailable);
|
|
100
|
-
resolve();
|
|
101
|
-
}
|
|
102
|
-
};
|
|
103
|
-
signal.addEventListener(
|
|
104
|
-
"abort",
|
|
105
|
-
() => this.emitter.off(ValidatorEvent.executionPayloadAvailable, onPayloadAvailable),
|
|
106
|
-
{once: true}
|
|
107
|
-
);
|
|
108
|
-
this.emitter.on(ValidatorEvent.executionPayloadAvailable, onPayloadAvailable);
|
|
109
|
-
});
|
|
110
|
-
}
|
|
111
|
-
|
|
112
85
|
private async signAndPublishPayloadAttestations(
|
|
113
86
|
slot: Slot,
|
|
114
87
|
payloadAttestationData: gloas.PayloadAttestationData,
|