@lodestar/beacon-node 1.48.0-dev.b4a608e68f → 1.48.0-dev.b62c97bb9f
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/validator/index.d.ts.map +1 -1
- package/lib/api/impl/validator/index.js +39 -39
- package/lib/api/impl/validator/index.js.map +1 -1
- package/lib/chain/blocks/importBlock.d.ts.map +1 -1
- package/lib/chain/blocks/importBlock.js +0 -13
- package/lib/chain/blocks/importBlock.js.map +1 -1
- package/lib/chain/chain.d.ts +5 -0
- package/lib/chain/chain.d.ts.map +1 -1
- package/lib/chain/chain.js +67 -38
- package/lib/chain/chain.js.map +1 -1
- package/lib/chain/emitter.d.ts +1 -1
- package/lib/chain/emitter.js +1 -1
- package/lib/chain/errors/blockError.d.ts +3 -5
- package/lib/chain/errors/blockError.d.ts.map +1 -1
- package/lib/chain/errors/blockError.js +2 -2
- package/lib/chain/errors/blockError.js.map +1 -1
- package/lib/chain/errors/executionPayloadEnvelope.d.ts +0 -11
- package/lib/chain/errors/executionPayloadEnvelope.d.ts.map +1 -1
- package/lib/chain/errors/executionPayloadEnvelope.js +0 -2
- package/lib/chain/errors/executionPayloadEnvelope.js.map +1 -1
- package/lib/chain/prepareNextSlot.js +13 -13
- package/lib/chain/prepareNextSlot.js.map +1 -1
- package/lib/chain/produceBlock/produceBlockBody.d.ts.map +1 -1
- package/lib/chain/produceBlock/produceBlockBody.js +46 -64
- package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
- package/lib/chain/validation/block.d.ts.map +1 -1
- package/lib/chain/validation/block.js +9 -50
- package/lib/chain/validation/block.js.map +1 -1
- package/lib/chain/validation/executionPayloadEnvelope.d.ts.map +1 -1
- package/lib/chain/validation/executionPayloadEnvelope.js +0 -29
- package/lib/chain/validation/executionPayloadEnvelope.js.map +1 -1
- package/lib/execution/engine/mock.d.ts.map +1 -1
- package/lib/execution/engine/mock.js +4 -1
- package/lib/execution/engine/mock.js.map +1 -1
- package/lib/network/reqresp/rateLimit.js +2 -1
- package/lib/network/reqresp/rateLimit.js.map +1 -1
- package/package.json +15 -15
- package/src/api/impl/validator/index.ts +44 -43
- package/src/chain/blocks/importBlock.ts +0 -13
- package/src/chain/chain.ts +74 -46
- package/src/chain/emitter.ts +1 -1
- package/src/chain/errors/blockError.ts +3 -3
- package/src/chain/errors/executionPayloadEnvelope.ts +0 -9
- package/src/chain/prepareNextSlot.ts +16 -16
- package/src/chain/produceBlock/produceBlockBody.ts +50 -71
- package/src/chain/validation/block.ts +9 -66
- package/src/chain/validation/executionPayloadEnvelope.ts +0 -37
- package/src/execution/engine/mock.ts +4 -1
- package/src/network/reqresp/rateLimit.ts +2 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mock.js","sourceRoot":"","sources":["../../../src/execution/engine/mock.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"mock.js","sourceRoot":"","sources":["../../../src/execution/engine/mock.ts"],"names":[],"mappings":"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"}
|
|
@@ -97,7 +97,8 @@ function getRequestCountFn(fork, config, method, fn) {
|
|
|
97
97
|
const type = requestSszTypeByMethod(fork, config)[method];
|
|
98
98
|
return (reqData) => {
|
|
99
99
|
try {
|
|
100
|
-
|
|
100
|
+
// A schema-valid request can cost 0 tokens; floor to 1 so it stays charged and bannable, not free.
|
|
101
|
+
return Math.max(1, (type && fn(type.deserialize(reqData))) ?? 1);
|
|
101
102
|
}
|
|
102
103
|
catch (_e) {
|
|
103
104
|
return 1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rateLimit.js","sourceRoot":"","sources":["../../../src/network/reqresp/rateLimit.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"rateLimit.js","sourceRoot":"","sources":["../../../src/network/reqresp/rateLimit.ts"],"names":[],"mappings":"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"}
|
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.48.0-dev.
|
|
14
|
+
"version": "1.48.0-dev.b62c97bb9f",
|
|
15
15
|
"type": "module",
|
|
16
16
|
"exports": {
|
|
17
17
|
".": {
|
|
@@ -109,7 +109,7 @@
|
|
|
109
109
|
"@chainsafe/persistent-merkle-tree": "^1.3.1",
|
|
110
110
|
"@chainsafe/prometheus-gc-stats": "^1.0.0",
|
|
111
111
|
"@chainsafe/snappy-wasm": "^0.5.0",
|
|
112
|
-
"@chainsafe/ssz": "^1.
|
|
112
|
+
"@chainsafe/ssz": "^1.7.0",
|
|
113
113
|
"@chainsafe/threads": "^1.11.3",
|
|
114
114
|
"@crate-crypto/node-eth-kzg": "0.9.1",
|
|
115
115
|
"@fastify/bearer-auth": "^10.0.1",
|
|
@@ -126,17 +126,17 @@
|
|
|
126
126
|
"@libp2p/peer-id": "^6.0.15",
|
|
127
127
|
"@libp2p/prometheus-metrics": "^5.0.28",
|
|
128
128
|
"@libp2p/tcp": "^11.0.27",
|
|
129
|
-
"@lodestar/api": "^1.48.0-dev.
|
|
130
|
-
"@lodestar/config": "^1.48.0-dev.
|
|
131
|
-
"@lodestar/db": "^1.48.0-dev.
|
|
132
|
-
"@lodestar/fork-choice": "^1.48.0-dev.
|
|
133
|
-
"@lodestar/logger": "^1.48.0-dev.
|
|
134
|
-
"@lodestar/params": "^1.48.0-dev.
|
|
135
|
-
"@lodestar/reqresp": "^1.48.0-dev.
|
|
136
|
-
"@lodestar/state-transition": "^1.48.0-dev.
|
|
137
|
-
"@lodestar/types": "^1.48.0-dev.
|
|
138
|
-
"@lodestar/utils": "^1.48.0-dev.
|
|
139
|
-
"@lodestar/validator": "^1.48.0-dev.
|
|
129
|
+
"@lodestar/api": "^1.48.0-dev.b62c97bb9f",
|
|
130
|
+
"@lodestar/config": "^1.48.0-dev.b62c97bb9f",
|
|
131
|
+
"@lodestar/db": "^1.48.0-dev.b62c97bb9f",
|
|
132
|
+
"@lodestar/fork-choice": "^1.48.0-dev.b62c97bb9f",
|
|
133
|
+
"@lodestar/logger": "^1.48.0-dev.b62c97bb9f",
|
|
134
|
+
"@lodestar/params": "^1.48.0-dev.b62c97bb9f",
|
|
135
|
+
"@lodestar/reqresp": "^1.48.0-dev.b62c97bb9f",
|
|
136
|
+
"@lodestar/state-transition": "^1.48.0-dev.b62c97bb9f",
|
|
137
|
+
"@lodestar/types": "^1.48.0-dev.b62c97bb9f",
|
|
138
|
+
"@lodestar/utils": "^1.48.0-dev.b62c97bb9f",
|
|
139
|
+
"@lodestar/validator": "^1.48.0-dev.b62c97bb9f",
|
|
140
140
|
"@multiformats/multiaddr": "^13.0.1",
|
|
141
141
|
"datastore-core": "^12.0.1",
|
|
142
142
|
"datastore-level": "^13.0.1",
|
|
@@ -158,7 +158,7 @@
|
|
|
158
158
|
"@libp2p/interface-internal": "^3.1.12",
|
|
159
159
|
"@libp2p/logger": "^6.2.13",
|
|
160
160
|
"@libp2p/utils": "^7.4.0",
|
|
161
|
-
"@lodestar/spec-test-util": "^1.48.0-dev.
|
|
161
|
+
"@lodestar/spec-test-util": "^1.48.0-dev.b62c97bb9f",
|
|
162
162
|
"@types/js-yaml": "^4.0.5",
|
|
163
163
|
"@types/qs": "^6.9.7",
|
|
164
164
|
"@types/tmp": "^0.2.3",
|
|
@@ -175,5 +175,5 @@
|
|
|
175
175
|
"beacon",
|
|
176
176
|
"blockchain"
|
|
177
177
|
],
|
|
178
|
-
"gitHead": "
|
|
178
|
+
"gitHead": "ffacf2defe27012776fa99ef295ca399cff1cc7a"
|
|
179
179
|
}
|
|
@@ -133,40 +133,37 @@ type BidCandidate = {
|
|
|
133
133
|
};
|
|
134
134
|
|
|
135
135
|
/**
|
|
136
|
-
*
|
|
137
|
-
*
|
|
138
|
-
* p2p bid, and the earlier received bid between builder api bids.
|
|
136
|
+
* Ranking value of a bid, the boosted total payment scaled by 100 as `boostFactor` is a percentage.
|
|
137
|
+
* Kept scaled so bids that differ by less than a percent are not truncated into a tie.
|
|
139
138
|
*/
|
|
140
|
-
function
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
if (candidateIsMaxBoost !== bestIsMaxBoost) {
|
|
152
|
-
if (candidateIsMaxBoost) {
|
|
153
|
-
best = candidate;
|
|
154
|
-
}
|
|
155
|
-
continue;
|
|
156
|
-
}
|
|
157
|
-
const candidateValue = boostedValue(candidate);
|
|
158
|
-
const bestValue = boostedValue(best);
|
|
159
|
-
if (candidateValue > bestValue) {
|
|
160
|
-
best = candidate;
|
|
161
|
-
} else if (
|
|
162
|
-
candidateValue === bestValue &&
|
|
163
|
-
// A tie prefers a builder api bid over the p2p bid, and the earlier received bid otherwise
|
|
164
|
-
(best.url === undefined || (candidate.url !== undefined && candidate.receivedMs < best.receivedMs))
|
|
165
|
-
) {
|
|
166
|
-
best = candidate;
|
|
167
|
-
}
|
|
139
|
+
function getBoostedTotalScaled({totalGwei, boostFactor}: BidCandidate): bigint {
|
|
140
|
+
return boostFactor * totalGwei;
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
/** Order bid candidates by preference, best first, used to select a bid and to log the ranking */
|
|
144
|
+
function compareBidCandidates(a: BidCandidate, b: BidCandidate): number {
|
|
145
|
+
// Preserve max boost preference before comparing bid values
|
|
146
|
+
const aIsMaxBoost = a.boostFactor === MAX_BUILDER_BOOST_FACTOR;
|
|
147
|
+
const bIsMaxBoost = b.boostFactor === MAX_BUILDER_BOOST_FACTOR;
|
|
148
|
+
if (aIsMaxBoost !== bIsMaxBoost) {
|
|
149
|
+
return aIsMaxBoost ? -1 : 1;
|
|
168
150
|
}
|
|
169
|
-
|
|
151
|
+
|
|
152
|
+
const aBoostedTotal = getBoostedTotalScaled(a);
|
|
153
|
+
const bBoostedTotal = getBoostedTotalScaled(b);
|
|
154
|
+
if (aBoostedTotal !== bBoostedTotal) {
|
|
155
|
+
return aBoostedTotal > bBoostedTotal ? -1 : 1;
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
// A tie prefers a builder api bid over the p2p bid
|
|
159
|
+
const aIsBuilderApi = a.url !== undefined;
|
|
160
|
+
const bIsBuilderApi = b.url !== undefined;
|
|
161
|
+
if (aIsBuilderApi !== bIsBuilderApi) {
|
|
162
|
+
return aIsBuilderApi ? -1 : 1;
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
// and the earlier received bid between builder api bids
|
|
166
|
+
return a.receivedMs - b.receivedMs;
|
|
170
167
|
}
|
|
171
168
|
|
|
172
169
|
type ProduceBlockContentsRes = {executionPayloadValue: Wei; consensusBlockValue: Wei} & {
|
|
@@ -1049,20 +1046,24 @@ export function getValidatorApi(
|
|
|
1049
1046
|
});
|
|
1050
1047
|
}
|
|
1051
1048
|
|
|
1052
|
-
|
|
1053
|
-
|
|
1054
|
-
|
|
1049
|
+
if (candidates.length === 0) {
|
|
1050
|
+
return null;
|
|
1051
|
+
}
|
|
1052
|
+
|
|
1053
|
+
const rankedCandidates = candidates.toSorted(compareBidCandidates);
|
|
1054
|
+
for (const [index, candidate] of rankedCandidates.entries()) {
|
|
1055
|
+
logger.debug("Builder bid candidate", {
|
|
1055
1056
|
slot,
|
|
1056
|
-
|
|
1057
|
-
|
|
1058
|
-
|
|
1059
|
-
|
|
1060
|
-
|
|
1061
|
-
|
|
1062
|
-
|
|
1057
|
+
rank: index + 1,
|
|
1058
|
+
source: candidate.url !== undefined ? toPrintableUrl(candidate.url) : "p2p",
|
|
1059
|
+
builder: candidate.signedBid.message.builderIndex,
|
|
1060
|
+
total: prettyGweiToEth(candidate.totalGwei),
|
|
1061
|
+
boost: candidate.boostFactor,
|
|
1062
|
+
boosted: prettyGweiToEth(getBoostedTotalScaled(candidate) / 100n),
|
|
1063
|
+
receivedMs: candidate.receivedMs,
|
|
1063
1064
|
});
|
|
1064
1065
|
}
|
|
1065
|
-
return
|
|
1066
|
+
return rankedCandidates[0];
|
|
1066
1067
|
})();
|
|
1067
1068
|
|
|
1068
1069
|
const commonBlockBodyPromise = chain.produceCommonBlockBody({
|
|
@@ -524,19 +524,6 @@ export async function importBlock(
|
|
|
524
524
|
this.metrics?.previousJustifiedEpoch.set(checkpointState.previousJustifiedCheckpoint.epoch);
|
|
525
525
|
this.metrics?.currentJustifiedEpoch.set(justifiedCheckpoint.epoch);
|
|
526
526
|
}
|
|
527
|
-
const finalizedCheckpoint = checkpointState.finalizedCheckpoint;
|
|
528
|
-
const finalizedEpoch = finalizedCheckpoint.epoch;
|
|
529
|
-
const preFinalizedEpoch = parentBlockSummary.finalizedEpoch;
|
|
530
|
-
if (finalizedEpoch > preFinalizedEpoch) {
|
|
531
|
-
this.emitter.emit(routes.events.EventType.finalizedCheckpoint, {
|
|
532
|
-
block: toRootHex(finalizedCheckpoint.root),
|
|
533
|
-
epoch: finalizedCheckpoint.epoch,
|
|
534
|
-
state: toRootHex(checkpointState.hashTreeRoot()),
|
|
535
|
-
executionOptimistic: false,
|
|
536
|
-
});
|
|
537
|
-
this.logger.verbose("Checkpoint finalized", toCheckpointHex(finalizedCheckpoint));
|
|
538
|
-
this.metrics?.finalizedEpoch.set(finalizedCheckpoint.epoch);
|
|
539
|
-
}
|
|
540
527
|
}
|
|
541
528
|
}
|
|
542
529
|
|
package/src/chain/chain.ts
CHANGED
|
@@ -1271,59 +1271,65 @@ export class BeaconChain implements IBeaconChain {
|
|
|
1271
1271
|
try {
|
|
1272
1272
|
const prevHead = this.forkChoice.getHead();
|
|
1273
1273
|
const head = this.forkChoice.updateAndGetHead({mode: UpdateHeadOpt.GetCanonicalHead}).head;
|
|
1274
|
+
this.emitHeadEvents(prevHead, head);
|
|
1275
|
+
return head;
|
|
1276
|
+
} catch (e) {
|
|
1277
|
+
this.metrics?.forkChoice.errors.inc({entrypoint: UpdateHeadOpt.GetCanonicalHead});
|
|
1278
|
+
throw e;
|
|
1279
|
+
} finally {
|
|
1280
|
+
timer?.();
|
|
1281
|
+
}
|
|
1282
|
+
}
|
|
1274
1283
|
|
|
1275
|
-
|
|
1276
|
-
|
|
1277
|
-
|
|
1278
|
-
|
|
1279
|
-
|
|
1284
|
+
/**
|
|
1285
|
+
* Emit `head` and `head_v2` when the fork choice head differs between two observations. Every caller that
|
|
1286
|
+
* can move the head, `updateAndGetHead()` and `updateTime()`, must capture the head before and pass both.
|
|
1287
|
+
*/
|
|
1288
|
+
private emitHeadEvents(prevHead: ProtoBlock, head: ProtoBlock): void {
|
|
1289
|
+
const headRootChanged = head.blockRoot !== prevHead.blockRoot;
|
|
1280
1290
|
|
|
1281
|
-
|
|
1282
|
-
|
|
1283
|
-
|
|
1284
|
-
const epochTransition = computeStartSlotAtEpoch(computeEpochAtSlot(head.slot)) === head.slot;
|
|
1285
|
-
const executionOptimistic = isOptimisticBlock(head);
|
|
1286
|
-
|
|
1287
|
-
if (headRootChanged) {
|
|
1288
|
-
this.emitter.emit(routes.events.EventType.head, {
|
|
1289
|
-
block: head.blockRoot,
|
|
1290
|
-
epochTransition,
|
|
1291
|
-
slot: head.slot,
|
|
1292
|
-
state: head.stateRoot,
|
|
1293
|
-
previousDutyDependentRoot,
|
|
1294
|
-
currentDutyDependentRoot,
|
|
1295
|
-
executionOptimistic,
|
|
1296
|
-
});
|
|
1297
|
-
}
|
|
1291
|
+
if (!headRootChanged && prevHead.payloadStatus === head.payloadStatus) {
|
|
1292
|
+
return;
|
|
1293
|
+
}
|
|
1298
1294
|
|
|
1299
|
-
|
|
1300
|
-
|
|
1301
|
-
|
|
1302
|
-
|
|
1303
|
-
|
|
1304
|
-
|
|
1305
|
-
|
|
1306
|
-
|
|
1307
|
-
|
|
1308
|
-
|
|
1309
|
-
|
|
1310
|
-
|
|
1295
|
+
try {
|
|
1296
|
+
const previousDutyDependentRoot = this.forkChoice.getDependentRoot(head, EpochDifference.previous);
|
|
1297
|
+
const currentDutyDependentRoot = this.forkChoice.getDependentRoot(head, EpochDifference.current);
|
|
1298
|
+
const epochTransition = computeStartSlotAtEpoch(computeEpochAtSlot(head.slot)) === head.slot;
|
|
1299
|
+
const executionOptimistic = isOptimisticBlock(head);
|
|
1300
|
+
|
|
1301
|
+
if (headRootChanged) {
|
|
1302
|
+
this.emitter.emit(routes.events.EventType.head, {
|
|
1303
|
+
block: head.blockRoot,
|
|
1304
|
+
epochTransition,
|
|
1305
|
+
slot: head.slot,
|
|
1306
|
+
state: head.stateRoot,
|
|
1307
|
+
previousDutyDependentRoot,
|
|
1308
|
+
currentDutyDependentRoot,
|
|
1309
|
+
executionOptimistic,
|
|
1311
1310
|
});
|
|
1312
|
-
} catch (e) {
|
|
1313
|
-
// getDependentRoot() may fail with error: "No block for root" as we can see in holesky non-finality issue
|
|
1314
|
-
this.logger.debug(
|
|
1315
|
-
"Error emitting head/head_v2 event",
|
|
1316
|
-
{slot: head.slot, root: head.blockRoot, headRootChanged},
|
|
1317
|
-
e as Error
|
|
1318
|
-
);
|
|
1319
1311
|
}
|
|
1320
1312
|
|
|
1321
|
-
|
|
1313
|
+
this.emitter.emit(routes.events.EventType.headV2, {
|
|
1314
|
+
version: this.config.getForkName(head.slot),
|
|
1315
|
+
data: {
|
|
1316
|
+
slot: head.slot,
|
|
1317
|
+
block: head.blockRoot,
|
|
1318
|
+
state: head.stateRoot,
|
|
1319
|
+
payloadStatus: head.payloadStatus === PayloadStatus.FULL ? "full" : "empty",
|
|
1320
|
+
epochTransition,
|
|
1321
|
+
currentEpochDependentRoot: previousDutyDependentRoot,
|
|
1322
|
+
nextEpochDependentRoot: currentDutyDependentRoot,
|
|
1323
|
+
executionOptimistic,
|
|
1324
|
+
},
|
|
1325
|
+
});
|
|
1322
1326
|
} catch (e) {
|
|
1323
|
-
|
|
1324
|
-
|
|
1325
|
-
|
|
1326
|
-
|
|
1327
|
+
// getDependentRoot() may fail with error: "No block for root" as we can see in holesky non-finality issue
|
|
1328
|
+
this.logger.debug(
|
|
1329
|
+
"Error emitting head/head_v2 event",
|
|
1330
|
+
{slot: head.slot, root: head.blockRoot, headRootChanged},
|
|
1331
|
+
e as Error
|
|
1332
|
+
);
|
|
1327
1333
|
}
|
|
1328
1334
|
}
|
|
1329
1335
|
|
|
@@ -1612,7 +1618,10 @@ export class BeaconChain implements IBeaconChain {
|
|
|
1612
1618
|
this.processShutdownCallback(this.forkChoice.irrecoverableError);
|
|
1613
1619
|
}
|
|
1614
1620
|
|
|
1621
|
+
// updateTime() recomputes the head on epoch-boundary checkpoint pull-up and under fast confirmation
|
|
1622
|
+
const prevHead = this.forkChoice.getHead();
|
|
1615
1623
|
this.forkChoice.updateTime(slot);
|
|
1624
|
+
this.emitHeadEvents(prevHead, this.forkChoice.getHead());
|
|
1616
1625
|
this.metrics?.clockSlot.set(slot);
|
|
1617
1626
|
|
|
1618
1627
|
this.attestationPool.prune(slot);
|
|
@@ -1670,6 +1679,25 @@ export class BeaconChain implements IBeaconChain {
|
|
|
1670
1679
|
|
|
1671
1680
|
private async onForkChoiceFinalized(this: BeaconChain, cp: CheckpointWithHex): Promise<void> {
|
|
1672
1681
|
this.logger.verbose("Fork choice finalized", {epoch: cp.epoch, root: cp.rootHex});
|
|
1682
|
+
this.metrics?.finalizedEpoch.set(cp.epoch);
|
|
1683
|
+
const finalizedBlock = this.forkChoice.getBlockHexDefaultStatus(cp.rootHex);
|
|
1684
|
+
if (finalizedBlock) {
|
|
1685
|
+
// The callback runs synchronously inside fork choice checkpoint updates, defer writing to subscribers
|
|
1686
|
+
callInNextEventLoop(() => {
|
|
1687
|
+
this.emitter.emit(routes.events.EventType.finalizedCheckpoint, {
|
|
1688
|
+
block: cp.rootHex,
|
|
1689
|
+
epoch: cp.epoch,
|
|
1690
|
+
state: finalizedBlock.stateRoot,
|
|
1691
|
+
executionOptimistic: isOptimisticBlock(finalizedBlock),
|
|
1692
|
+
});
|
|
1693
|
+
});
|
|
1694
|
+
} else {
|
|
1695
|
+
this.logger.debug("Finalized block not found in fork choice, skip finalized_checkpoint event", {
|
|
1696
|
+
epoch: cp.epoch,
|
|
1697
|
+
root: cp.rootHex,
|
|
1698
|
+
});
|
|
1699
|
+
}
|
|
1700
|
+
|
|
1673
1701
|
const finalizedSlot = computeStartSlotAtEpoch(cp.epoch);
|
|
1674
1702
|
this.seenBlockProposers.prune(finalizedSlot);
|
|
1675
1703
|
|
package/src/chain/emitter.ts
CHANGED
|
@@ -33,7 +33,7 @@ export enum ChainEvent {
|
|
|
33
33
|
/**
|
|
34
34
|
* This event signals that the fork choice store has been updated.
|
|
35
35
|
*
|
|
36
|
-
* This event is guaranteed to be triggered whenever the fork choice
|
|
36
|
+
* This event is guaranteed to be triggered whenever the fork choice finalized checkpoint is updated. This is either in response to a newly processed block or a new clock tick.
|
|
37
37
|
*/
|
|
38
38
|
forkChoiceFinalized = "forkChoice:finalized",
|
|
39
39
|
/**
|
|
@@ -78,8 +78,8 @@ export enum BlockErrorCode {
|
|
|
78
78
|
TOO_MANY_KZG_COMMITMENTS = "BLOCK_ERROR_TOO_MANY_KZG_COMMITMENTS",
|
|
79
79
|
/** Bid parent block root does not match block parent root */
|
|
80
80
|
BID_PARENT_ROOT_MISMATCH = "BLOCK_ERROR_BID_PARENT_ROOT_MISMATCH",
|
|
81
|
-
/** A block
|
|
82
|
-
|
|
81
|
+
/** A block contains deposits where none are allowed */
|
|
82
|
+
NON_ZERO_DEPOSITS = "BLOCK_ERROR_NON_ZERO_DEPOSITS",
|
|
83
83
|
/** The parent block's execution payload has been verified as invalid */
|
|
84
84
|
PARENT_EXECUTION_INVALID = "BLOCK_ERROR_PARENT_EXECUTION_INVALID",
|
|
85
85
|
/**
|
|
@@ -153,7 +153,7 @@ export type BlockErrorType =
|
|
|
153
153
|
| {code: BlockErrorCode.DATA_UNAVAILABLE}
|
|
154
154
|
| {code: BlockErrorCode.TOO_MANY_KZG_COMMITMENTS; blobKzgCommitmentsLen: number; commitmentLimit: number}
|
|
155
155
|
| {code: BlockErrorCode.BID_PARENT_ROOT_MISMATCH; bidParentRoot: RootHex; blockParentRoot: RootHex}
|
|
156
|
-
| {code: BlockErrorCode.
|
|
156
|
+
| {code: BlockErrorCode.NON_ZERO_DEPOSITS; count: number}
|
|
157
157
|
| {code: BlockErrorCode.PARENT_EXECUTION_INVALID; parentRoot: RootHex}
|
|
158
158
|
| {code: BlockErrorCode.PARENT_PAYLOAD_UNKNOWN; parentRoot: RootHex; parentBlockHash: RootHex}
|
|
159
159
|
| {code: BlockErrorCode.NON_LINEAR_PAYLOAD_ROOTS; parentBlockHash: RootHex; expectedBlockHash: RootHex};
|
|
@@ -12,8 +12,6 @@ export enum ExecutionPayloadEnvelopeErrorCode {
|
|
|
12
12
|
BUILDER_INDEX_MISMATCH = "EXECUTION_PAYLOAD_ENVELOPE_ERROR_BUILDER_INDEX_MISMATCH",
|
|
13
13
|
BLOCK_HASH_MISMATCH = "EXECUTION_PAYLOAD_ENVELOPE_ERROR_BLOCK_HASH_MISMATCH",
|
|
14
14
|
EXECUTION_REQUESTS_ROOT_MISMATCH = "EXECUTION_PAYLOAD_ENVELOPE_ERROR_EXECUTION_REQUESTS_ROOT_MISMATCH",
|
|
15
|
-
EXECUTION_REQUESTS_COUNT_EXCEEDED = "EXECUTION_PAYLOAD_ENVELOPE_ERROR_EXECUTION_REQUESTS_COUNT_EXCEEDED",
|
|
16
|
-
WITHDRAWALS_COUNT_EXCEEDED = "EXECUTION_PAYLOAD_ENVELOPE_ERROR_WITHDRAWALS_COUNT_EXCEEDED",
|
|
17
15
|
INVALID_SIGNATURE = "EXECUTION_PAYLOAD_ENVELOPE_ERROR_INVALID_SIGNATURE",
|
|
18
16
|
PAYLOAD_ENVELOPE_INPUT_MISSING = "EXECUTION_PAYLOAD_ENVELOPE_ERROR_PAYLOAD_ENVELOPE_INPUT_MISSING",
|
|
19
17
|
}
|
|
@@ -44,13 +42,6 @@ export type ExecutionPayloadEnvelopeErrorType =
|
|
|
44
42
|
envelopeRequestsRoot: RootHex;
|
|
45
43
|
bidRequestsRoot: RootHex;
|
|
46
44
|
}
|
|
47
|
-
| {
|
|
48
|
-
code: ExecutionPayloadEnvelopeErrorCode.EXECUTION_REQUESTS_COUNT_EXCEEDED;
|
|
49
|
-
name: string;
|
|
50
|
-
count: number;
|
|
51
|
-
limit: number;
|
|
52
|
-
}
|
|
53
|
-
| {code: ExecutionPayloadEnvelopeErrorCode.WITHDRAWALS_COUNT_EXCEEDED; count: number; limit: number}
|
|
54
45
|
| {code: ExecutionPayloadEnvelopeErrorCode.INVALID_SIGNATURE}
|
|
55
46
|
| {code: ExecutionPayloadEnvelopeErrorCode.PAYLOAD_ENVELOPE_INPUT_MISSING; blockRoot: RootHex};
|
|
56
47
|
|
|
@@ -243,6 +243,22 @@ export class PrepareNextSlotScheduler {
|
|
|
243
243
|
parentBlockHash = preparedState.latestExecutionPayloadHeader.blockHash;
|
|
244
244
|
}
|
|
245
245
|
|
|
246
|
+
// If emitPayloadAttributes is true emit a SSE payloadAttributes event for
|
|
247
|
+
// every slot. Without the flag, only emit the event if we are proposing in the next slot.
|
|
248
|
+
if (
|
|
249
|
+
(feeRecipient || this.chain.opts.emitPayloadAttributes === true) &&
|
|
250
|
+
this.chain.emitter.listenerCount(routes.events.EventType.payloadAttributes)
|
|
251
|
+
) {
|
|
252
|
+
const data = getPayloadAttributesForSSE(fork as ForkPostBellatrix, this.chain, {
|
|
253
|
+
prepareState: stateAfterParentPayload,
|
|
254
|
+
prepareSlot,
|
|
255
|
+
parentBlockRoot: fromHex(updatedHead.blockRoot),
|
|
256
|
+
parentBlockHash,
|
|
257
|
+
feeRecipient: feeRecipient ?? "0x0000000000000000000000000000000000000000",
|
|
258
|
+
});
|
|
259
|
+
this.chain.emitter.emit(routes.events.EventType.payloadAttributes, {data, version: fork});
|
|
260
|
+
}
|
|
261
|
+
|
|
246
262
|
if (feeRecipient) {
|
|
247
263
|
const preparationTime =
|
|
248
264
|
computeTimeAtSlot(this.config, prepareSlot, this.chain.genesisTime) - Date.now() / 1000;
|
|
@@ -273,22 +289,6 @@ export class PrepareNextSlotScheduler {
|
|
|
273
289
|
}
|
|
274
290
|
|
|
275
291
|
this.computeStateHashTreeRoot(preparedState, isEpochTransition);
|
|
276
|
-
|
|
277
|
-
// If emitPayloadAttributes is true emit a SSE payloadAttributes event for
|
|
278
|
-
// every slot. Without the flag, only emit the event if we are proposing in the next slot.
|
|
279
|
-
if (
|
|
280
|
-
(feeRecipient || this.chain.opts.emitPayloadAttributes === true) &&
|
|
281
|
-
this.chain.emitter.listenerCount(routes.events.EventType.payloadAttributes)
|
|
282
|
-
) {
|
|
283
|
-
const data = getPayloadAttributesForSSE(fork as ForkPostBellatrix, this.chain, {
|
|
284
|
-
prepareState: stateAfterParentPayload,
|
|
285
|
-
prepareSlot,
|
|
286
|
-
parentBlockRoot: fromHex(updatedHead.blockRoot),
|
|
287
|
-
parentBlockHash,
|
|
288
|
-
feeRecipient: feeRecipient ?? "0x0000000000000000000000000000000000000000",
|
|
289
|
-
});
|
|
290
|
-
this.chain.emitter.emit(routes.events.EventType.payloadAttributes, {data, version: fork});
|
|
291
|
-
}
|
|
292
292
|
} else {
|
|
293
293
|
// Pre-bellatrix only reaches here at an epoch transition to precompute the next epoch state
|
|
294
294
|
const preparedState = await this.chain.regen.getBlockSlotState(
|