@lodestar/beacon-node 1.32.0-peerDAS.c530895658 → 1.32.0-peerDAS.d30e8dea19
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/blocks/index.js +34 -4
- package/lib/api/impl/beacon/blocks/index.js.map +1 -1
- package/lib/api/impl/beacon/state/index.js +13 -1
- package/lib/api/impl/beacon/state/index.js.map +1 -1
- package/lib/api/impl/debug/index.d.ts +1 -1
- package/lib/api/impl/debug/index.js +24 -1
- package/lib/api/impl/debug/index.js.map +1 -1
- package/lib/api/impl/validator/index.js +43 -29
- 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/metrics.js +8 -0
- package/lib/chain/archiveStore/historicalState/metrics.js.map +1 -1
- package/lib/chain/archiveStore/utils/archiveBlocks.d.ts +1 -1
- package/lib/chain/archiveStore/utils/archiveBlocks.js +29 -1
- package/lib/chain/archiveStore/utils/archiveBlocks.js.map +1 -1
- package/lib/chain/blocks/importBlock.js +1 -52
- package/lib/chain/blocks/importBlock.js.map +1 -1
- package/lib/chain/blocks/types.d.ts +1 -0
- package/lib/chain/blocks/types.js.map +1 -1
- package/lib/chain/blocks/verifyBlocksDataAvailability.js +3 -3
- package/lib/chain/blocks/verifyBlocksDataAvailability.js.map +1 -1
- package/lib/chain/chain.d.ts +9 -6
- package/lib/chain/chain.js +37 -10
- package/lib/chain/chain.js.map +1 -1
- package/lib/chain/emitter.d.ts +6 -1
- package/lib/chain/emitter.js +4 -0
- package/lib/chain/emitter.js.map +1 -1
- package/lib/chain/interface.d.ts +4 -4
- package/lib/chain/interface.js.map +1 -1
- package/lib/chain/options.d.ts +2 -2
- package/lib/chain/produceBlock/produceBlockBody.d.ts +1 -1
- package/lib/chain/produceBlock/produceBlockBody.js +146 -117
- package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
- package/lib/chain/produceBlock/validateBlobsAndKzgCommitments.d.ts +1 -1
- package/lib/chain/produceBlock/validateBlobsAndKzgCommitments.js +6 -12
- package/lib/chain/produceBlock/validateBlobsAndKzgCommitments.js.map +1 -1
- package/lib/chain/seenCache/seenGossipBlockInput.d.ts +4 -1
- package/lib/chain/seenCache/seenGossipBlockInput.js +76 -10
- package/lib/chain/seenCache/seenGossipBlockInput.js.map +1 -1
- package/lib/chain/validation/blobSidecar.d.ts +1 -1
- package/lib/chain/validation/blobSidecar.js +6 -6
- package/lib/chain/validation/blobSidecar.js.map +1 -1
- package/lib/chain/validation/dataColumnSidecar.d.ts +3 -3
- package/lib/chain/validation/dataColumnSidecar.js +12 -9
- package/lib/chain/validation/dataColumnSidecar.js.map +1 -1
- package/lib/execution/engine/mock.js +3 -3
- package/lib/execution/engine/mock.js.map +1 -1
- package/lib/metrics/metrics/beacon.d.ts +7 -0
- package/lib/metrics/metrics/beacon.js +34 -1
- package/lib/metrics/metrics/beacon.js.map +1 -1
- package/lib/metrics/metrics/lodestar.d.ts +9 -0
- package/lib/metrics/metrics/lodestar.js +22 -0
- package/lib/metrics/metrics/lodestar.js.map +1 -1
- package/lib/network/core/networkCore.d.ts +7 -7
- package/lib/network/core/networkCore.js +47 -45
- package/lib/network/core/networkCore.js.map +1 -1
- package/lib/network/core/networkCoreWorkerHandler.d.ts +3 -3
- package/lib/network/core/networkCoreWorkerHandler.js.map +1 -1
- package/lib/network/core/types.d.ts +8 -4
- package/lib/network/discv5/index.d.ts +1 -0
- package/lib/network/discv5/index.js +1 -0
- package/lib/network/discv5/index.js.map +1 -1
- package/lib/network/discv5/types.d.ts +1 -0
- package/lib/network/discv5/utils.d.ts +3 -1
- package/lib/network/discv5/utils.js +12 -2
- package/lib/network/discv5/utils.js.map +1 -1
- package/lib/network/discv5/worker.js +5 -1
- package/lib/network/discv5/worker.js.map +1 -1
- package/lib/network/events.d.ts +2 -2
- package/lib/network/forks.d.ts +2 -0
- package/lib/network/forks.js +4 -0
- package/lib/network/forks.js.map +1 -1
- package/lib/network/gossip/encoding.js +1 -1
- package/lib/network/gossip/encoding.js.map +1 -1
- package/lib/network/gossip/gossipsub.js +6 -4
- package/lib/network/gossip/gossipsub.js.map +1 -1
- package/lib/network/gossip/interface.d.ts +3 -3
- package/lib/network/gossip/scoringParameters.js +10 -10
- package/lib/network/gossip/scoringParameters.js.map +1 -1
- package/lib/network/gossip/topic.js +14 -13
- package/lib/network/gossip/topic.js.map +1 -1
- package/lib/network/interface.d.ts +2 -2
- package/lib/network/network.d.ts +4 -4
- package/lib/network/network.js +69 -54
- package/lib/network/network.js.map +1 -1
- package/lib/network/networkConfig.js +1 -1
- package/lib/network/networkConfig.js.map +1 -1
- package/lib/network/peers/discover.js +1 -0
- package/lib/network/peers/discover.js.map +1 -1
- package/lib/network/peers/peerManager.d.ts +2 -2
- package/lib/network/peers/peerManager.js +4 -1
- package/lib/network/peers/peerManager.js.map +1 -1
- package/lib/network/peers/peersData.d.ts +9 -2
- package/lib/network/peers/peersData.js.map +1 -1
- package/lib/network/peers/utils/assertPeerRelevance.d.ts +7 -3
- package/lib/network/peers/utils/assertPeerRelevance.js +10 -1
- package/lib/network/peers/utils/assertPeerRelevance.js.map +1 -1
- package/lib/network/peers/utils/prioritizePeers.d.ts +3 -3
- package/lib/network/peers/utils/prioritizePeers.js.map +1 -1
- package/lib/network/processor/gossipHandlers.js +41 -30
- package/lib/network/processor/gossipHandlers.js.map +1 -1
- package/lib/network/processor/gossipQueues/index.js +1 -1
- package/lib/network/processor/gossipQueues/index.js.map +1 -1
- package/lib/network/processor/index.js +2 -2
- package/lib/network/processor/index.js.map +1 -1
- package/lib/network/reqresp/ReqRespBeaconNode.d.ts +5 -5
- package/lib/network/reqresp/ReqRespBeaconNode.js +20 -15
- package/lib/network/reqresp/ReqRespBeaconNode.js.map +1 -1
- package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.d.ts +2 -1
- package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.js +6 -2
- package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.js.map +1 -1
- package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.d.ts +1 -0
- package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.js +26 -6
- package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.js.map +1 -1
- package/lib/network/reqresp/handlers/beaconBlocksByRange.js +2 -2
- package/lib/network/reqresp/handlers/beaconBlocksByRange.js.map +1 -1
- package/lib/network/reqresp/handlers/beaconBlocksByRoot.js +1 -1
- package/lib/network/reqresp/handlers/beaconBlocksByRoot.js.map +1 -1
- package/lib/network/reqresp/handlers/blobSidecarsByRange.js +1 -1
- package/lib/network/reqresp/handlers/blobSidecarsByRange.js.map +1 -1
- package/lib/network/reqresp/handlers/blobSidecarsByRoot.js +1 -1
- package/lib/network/reqresp/handlers/blobSidecarsByRoot.js.map +1 -1
- package/lib/network/reqresp/handlers/dataColumnSidecarsByRange.js +1 -1
- package/lib/network/reqresp/handlers/dataColumnSidecarsByRange.js.map +1 -1
- package/lib/network/reqresp/handlers/dataColumnSidecarsByRoot.js +1 -1
- package/lib/network/reqresp/handlers/dataColumnSidecarsByRoot.js.map +1 -1
- package/lib/network/reqresp/handlers/lightClientBootstrap.js +1 -1
- package/lib/network/reqresp/handlers/lightClientBootstrap.js.map +1 -1
- package/lib/network/reqresp/handlers/lightClientFinalityUpdate.js +1 -1
- package/lib/network/reqresp/handlers/lightClientFinalityUpdate.js.map +1 -1
- package/lib/network/reqresp/handlers/lightClientOptimisticUpdate.js +1 -1
- package/lib/network/reqresp/handlers/lightClientOptimisticUpdate.js.map +1 -1
- package/lib/network/reqresp/handlers/lightClientUpdatesByRange.js +1 -1
- package/lib/network/reqresp/handlers/lightClientUpdatesByRange.js.map +1 -1
- package/lib/network/reqresp/handlers/status.js +4 -3
- package/lib/network/reqresp/handlers/status.js.map +1 -1
- package/lib/network/reqresp/protocols.d.ts +1 -0
- package/lib/network/reqresp/protocols.js +5 -0
- package/lib/network/reqresp/protocols.js.map +1 -1
- package/lib/network/reqresp/types.d.ts +3 -3
- package/lib/network/reqresp/types.js +3 -3
- package/lib/network/reqresp/types.js.map +1 -1
- package/lib/network/statusCache.d.ts +5 -5
- package/lib/network/statusCache.js.map +1 -1
- package/lib/network/subnets/attnetsService.d.ts +3 -3
- package/lib/network/subnets/attnetsService.js +17 -17
- package/lib/network/subnets/attnetsService.js.map +1 -1
- package/lib/network/subnets/interface.d.ts +3 -3
- package/lib/network/subnets/syncnetsService.d.ts +3 -3
- package/lib/network/subnets/syncnetsService.js +13 -13
- package/lib/network/subnets/syncnetsService.js.map +1 -1
- package/lib/network/subscribeBoundary.d.ts +5 -0
- package/lib/network/subscribeBoundary.js +4 -0
- package/lib/network/subscribeBoundary.js.map +1 -0
- package/lib/node/nodejs.js +0 -6
- package/lib/node/nodejs.js.map +1 -1
- package/lib/sync/range/chain.d.ts +6 -3
- package/lib/sync/range/chain.js +14 -14
- package/lib/sync/range/chain.js.map +1 -1
- package/lib/sync/range/range.d.ts +3 -2
- package/lib/sync/range/range.js +8 -3
- package/lib/sync/range/range.js.map +1 -1
- package/lib/sync/range/utils/peerBalancer.d.ts +4 -7
- package/lib/sync/range/utils/peerBalancer.js +13 -8
- package/lib/sync/range/utils/peerBalancer.js.map +1 -1
- package/lib/sync/unknownBlock.js +12 -14
- package/lib/sync/unknownBlock.js.map +1 -1
- package/lib/sync/utils/remoteSyncType.d.ts +4 -4
- package/lib/sync/utils/remoteSyncType.js.map +1 -1
- package/lib/util/blobs.d.ts +5 -0
- package/lib/util/blobs.js +62 -2
- package/lib/util/blobs.js.map +1 -1
- package/lib/util/dataColumns.d.ts +32 -6
- package/lib/util/dataColumns.js +84 -8
- package/lib/util/dataColumns.js.map +1 -1
- package/lib/util/kzg.d.ts +2 -22
- package/lib/util/kzg.js +2 -47
- package/lib/util/kzg.js.map +1 -1
- package/package.json +15 -15
|
@@ -2,16 +2,20 @@ import { toHexString } from "@chainsafe/ssz";
|
|
|
2
2
|
import { ForkName, NUMBER_OF_COLUMNS, isForkPostDeneb } from "@lodestar/params";
|
|
3
3
|
import { ssz } from "@lodestar/types";
|
|
4
4
|
import { pruneSetToMax } from "@lodestar/utils";
|
|
5
|
-
import { getDataColumnsFromExecution, hasSampledDataColumns } from "../../util/dataColumns.js";
|
|
5
|
+
import { RecoverResult, getDataColumnsFromExecution, hasSampledDataColumns, recoverDataColumnSidecars, } from "../../util/dataColumns.js";
|
|
6
6
|
import { callInNextEventLoop } from "../../util/eventLoop.js";
|
|
7
7
|
import { BlobsSource, BlockSource, DataColumnsSource, GossipedInputType, getBlockInput, getBlockInputBlobs, getBlockInputDataColumns, } from "../blocks/types.js";
|
|
8
|
+
import { ChainEvent } from "../emitter.js";
|
|
8
9
|
import { DataColumnSidecarErrorCode, DataColumnSidecarGossipError } from "../errors/dataColumnSidecarError.js";
|
|
9
10
|
import { GossipAction } from "../errors/gossipValidation.js";
|
|
10
11
|
export var BlockInputAvailabilitySource;
|
|
11
12
|
(function (BlockInputAvailabilitySource) {
|
|
12
13
|
BlockInputAvailabilitySource["GOSSIP"] = "gossip";
|
|
14
|
+
BlockInputAvailabilitySource["RECOVERED"] = "recovered";
|
|
13
15
|
BlockInputAvailabilitySource["UNKNOWN_SYNC"] = "unknown_sync";
|
|
14
16
|
})(BlockInputAvailabilitySource || (BlockInputAvailabilitySource = {}));
|
|
17
|
+
// TODO(fulu): dedup with gossipHandlers.ts
|
|
18
|
+
const BLOCK_AVAILABILITY_CUTOFF_MS = 3_000;
|
|
15
19
|
const MAX_GOSSIPINPUT_CACHE = 5;
|
|
16
20
|
/**
|
|
17
21
|
* For predeneb, SeenGossipBlockInput only tracks and caches block so that we don't need to download known block
|
|
@@ -25,11 +29,12 @@ const MAX_GOSSIPINPUT_CACHE = 5;
|
|
|
25
29
|
* block are seen by SeenGossipBlockInput
|
|
26
30
|
*/
|
|
27
31
|
export class SeenGossipBlockInput {
|
|
28
|
-
constructor(custodyConfig, executionEngine, emitter, logger) {
|
|
32
|
+
constructor(custodyConfig, executionEngine, emitter, clock, logger) {
|
|
29
33
|
this.blockInputCache = new Map();
|
|
30
34
|
this.globalCacheId = 0;
|
|
31
35
|
this.custodyConfig = custodyConfig;
|
|
32
36
|
this.executionEngine = executionEngine;
|
|
37
|
+
this.clock = clock;
|
|
33
38
|
this.emitter = emitter;
|
|
34
39
|
this.logger = logger;
|
|
35
40
|
}
|
|
@@ -80,8 +85,8 @@ export class SeenGossipBlockInput {
|
|
|
80
85
|
fork = config.getForkName(blobSidecar.signedBlockHeader.message.slot);
|
|
81
86
|
blockHex = toHexString(blockRoot);
|
|
82
87
|
blockCache = this.blockInputCache.get(blockHex) ?? getEmptyBlockInputCacheEntry(fork, ++this.globalCacheId);
|
|
83
|
-
if (blockCache.cachedData?.fork !== ForkName.deneb) {
|
|
84
|
-
throw Error(`blob data at non deneb fork=${blockCache.fork}`);
|
|
88
|
+
if (blockCache.cachedData?.fork !== ForkName.deneb && blockCache.cachedData?.fork !== ForkName.electra) {
|
|
89
|
+
throw Error(`blob data at non deneb/electra fork=${blockCache.fork}`);
|
|
85
90
|
}
|
|
86
91
|
// TODO: freetheblobs check if its the same blob or a duplicate and throw/take actions
|
|
87
92
|
blockCache.cachedData?.blobsCache.set(blobSidecar.index, blobSidecar);
|
|
@@ -115,7 +120,7 @@ export class SeenGossipBlockInput {
|
|
|
115
120
|
if (!this.blockInputCache.has(blockHex)) {
|
|
116
121
|
this.blockInputCache.set(blockHex, blockCache);
|
|
117
122
|
callInNextEventLoop(() => {
|
|
118
|
-
getDataColumnsFromExecution(config, this.custodyConfig, this.executionEngine, this.emitter, blockCache)
|
|
123
|
+
getDataColumnsFromExecution(config, this.custodyConfig, this.executionEngine, this.emitter, blockCache, metrics)
|
|
119
124
|
.then((_success) => {
|
|
120
125
|
// TODO: (@matthewkeil) add metrics collection point here
|
|
121
126
|
})
|
|
@@ -173,7 +178,7 @@ export class SeenGossipBlockInput {
|
|
|
173
178
|
};
|
|
174
179
|
}
|
|
175
180
|
if (cachedData.fork === ForkName.fulu) {
|
|
176
|
-
const { dataColumnsCache, resolveAvailability } = cachedData;
|
|
181
|
+
const { dataColumnsCache, resolveAvailability, calledRecover } = cachedData;
|
|
177
182
|
// block is available, check if all blobs have shown up
|
|
178
183
|
const { slot } = signedBlock.message;
|
|
179
184
|
const blockInfo = `blockHex=${blockHex}, slot=${slot}`;
|
|
@@ -198,19 +203,79 @@ export class SeenGossipBlockInput {
|
|
|
198
203
|
blockInputMeta: { pending: null, haveColumns: 0, expectedColumns: 0 },
|
|
199
204
|
};
|
|
200
205
|
}
|
|
201
|
-
|
|
206
|
+
const resolveAvailabilityAndBlockInput = (source) => {
|
|
202
207
|
const allDataColumns = getBlockInputDataColumns(dataColumnsCache, this.custodyConfig.sampledColumns);
|
|
203
|
-
metrics?.syncUnknownBlock.resolveAvailabilitySource.inc({ source: BlockInputAvailabilitySource.GOSSIP });
|
|
204
|
-
const { dataColumns } = allDataColumns;
|
|
205
208
|
const blockData = {
|
|
206
209
|
fork: cachedData.fork,
|
|
207
210
|
...allDataColumns,
|
|
208
211
|
dataColumnsSource: DataColumnsSource.gossip,
|
|
209
212
|
};
|
|
210
213
|
resolveAvailability(blockData);
|
|
211
|
-
|
|
214
|
+
// TODO(das): should not use syncUnknownBlock metrics here
|
|
215
|
+
metrics?.syncUnknownBlock.resolveAvailabilitySource.inc({ source });
|
|
212
216
|
const blockInput = getBlockInput.availableData(config, signedBlock, BlockSource.gossip, blockData);
|
|
213
217
|
resolveBlockInput(blockInput);
|
|
218
|
+
return blockInput;
|
|
219
|
+
};
|
|
220
|
+
const columnCount = dataColumnsCache.size;
|
|
221
|
+
if (
|
|
222
|
+
// only try to recover all columns with "--supernode"
|
|
223
|
+
this.custodyConfig.sampledColumns.length === NUMBER_OF_COLUMNS &&
|
|
224
|
+
columnCount >= NUMBER_OF_COLUMNS / 2 &&
|
|
225
|
+
columnCount < NUMBER_OF_COLUMNS &&
|
|
226
|
+
!calledRecover &&
|
|
227
|
+
// doing recover right away is not efficient because it may delay data_column_sidecar validation
|
|
228
|
+
this.clock.secFromSlot(slot) * 1000 >= BLOCK_AVAILABILITY_CUTOFF_MS) {
|
|
229
|
+
// should call once per slot
|
|
230
|
+
cachedData.calledRecover = true;
|
|
231
|
+
callInNextEventLoop(async () => {
|
|
232
|
+
const logCtx = {
|
|
233
|
+
blockHex,
|
|
234
|
+
slot,
|
|
235
|
+
dataColumns: dataColumnsCache.size,
|
|
236
|
+
};
|
|
237
|
+
const recoverResult = await recoverDataColumnSidecars(dataColumnsCache, this.clock, metrics).catch((e) => {
|
|
238
|
+
this.logger.error("Error recovering data column sidecars", logCtx, e);
|
|
239
|
+
return RecoverResult.Failed;
|
|
240
|
+
});
|
|
241
|
+
metrics?.recoverDataColumnSidecars.result.inc({ result: recoverResult });
|
|
242
|
+
switch (recoverResult) {
|
|
243
|
+
case RecoverResult.SuccessResolved: {
|
|
244
|
+
resolveAvailabilityAndBlockInput(BlockInputAvailabilitySource.RECOVERED);
|
|
245
|
+
// Publish columns if and only if subscribed to them
|
|
246
|
+
const sampledColumns = this.custodyConfig.sampledColumns.map((columnIndex) => {
|
|
247
|
+
const dataColumn = dataColumnsCache.get(columnIndex)?.dataColumn;
|
|
248
|
+
if (!dataColumn) {
|
|
249
|
+
throw Error(`After recover, missing data column for index=${columnIndex} in cache`);
|
|
250
|
+
}
|
|
251
|
+
return dataColumn;
|
|
252
|
+
});
|
|
253
|
+
// for columns that we already seen, it will be ignored through `ignoreDuplicatePublishError` gossip option
|
|
254
|
+
this.emitter.emit(ChainEvent.publishDataColumns, sampledColumns);
|
|
255
|
+
this.logger.verbose("Recovered data column sidecars and resolved availability", logCtx);
|
|
256
|
+
break;
|
|
257
|
+
}
|
|
258
|
+
case RecoverResult.SuccessLate:
|
|
259
|
+
this.logger.verbose("Recovered data column sidecars but it's late to resolve availability", logCtx);
|
|
260
|
+
break;
|
|
261
|
+
case RecoverResult.Failed:
|
|
262
|
+
this.logger.verbose("Failed to recover data column sidecars", logCtx);
|
|
263
|
+
break;
|
|
264
|
+
case RecoverResult.NotAttemptedFull:
|
|
265
|
+
this.logger.verbose("Did not attempt because we have full column sidecars", logCtx);
|
|
266
|
+
break;
|
|
267
|
+
case RecoverResult.NotAttemptedLessThanHalf:
|
|
268
|
+
this.logger.verbose("Did not attempt because we have too few column sidecars", logCtx);
|
|
269
|
+
break;
|
|
270
|
+
default:
|
|
271
|
+
break;
|
|
272
|
+
}
|
|
273
|
+
});
|
|
274
|
+
}
|
|
275
|
+
if (hasSampledDataColumns(this.custodyConfig, dataColumnsCache)) {
|
|
276
|
+
const blockInput = resolveAvailabilityAndBlockInput(BlockInputAvailabilitySource.GOSSIP);
|
|
277
|
+
const allDataColumns = getBlockInputDataColumns(dataColumnsCache, this.custodyConfig.sampledColumns);
|
|
278
|
+
const { dataColumns } = allDataColumns;
|
|
214
279
|
return {
|
|
215
280
|
blockInput,
|
|
216
281
|
blockInputMeta: {
|
|
@@ -330,6 +395,7 @@ export function getEmptyBlockInputCacheEntry(fork, globalCacheId) {
|
|
|
330
395
|
availabilityPromise,
|
|
331
396
|
resolveAvailability,
|
|
332
397
|
cacheId: ++globalCacheId,
|
|
398
|
+
calledRecover: false,
|
|
333
399
|
};
|
|
334
400
|
return { fork, blockInputPromise, resolveBlockInput, cachedData };
|
|
335
401
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seenGossipBlockInput.js","sourceRoot":"","sources":["../../../src/chain/seenCache/seenGossipBlockInput.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"seenGossipBlockInput.js","sourceRoot":"","sources":["../../../src/chain/seenCache/seenGossipBlockInput.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,5 +4,5 @@ import { IBeaconChain } from "../interface.js";
|
|
|
4
4
|
export declare function validateGossipBlobSidecar(fork: ForkName, chain: IBeaconChain, blobSidecar: deneb.BlobSidecar, subnet: SubnetID): Promise<void>;
|
|
5
5
|
export declare function validateBlobSidecars(blockSlot: Slot, blockRoot: Root, expectedKzgCommitments: deneb.BlobKzgCommitments, blobSidecars: deneb.BlobSidecars, opts?: {
|
|
6
6
|
skipProofsCheck: boolean;
|
|
7
|
-
}): void
|
|
7
|
+
}): Promise<void>;
|
|
8
8
|
//# sourceMappingURL=blobSidecar.d.ts.map
|
|
@@ -3,7 +3,7 @@ import { computeEpochAtSlot, computeStartSlotAtEpoch, getBlockHeaderProposerSign
|
|
|
3
3
|
import { ssz } from "@lodestar/types";
|
|
4
4
|
import { toRootHex, verifyMerkleBranch } from "@lodestar/utils";
|
|
5
5
|
import { byteArrayEquals } from "../../util/bytes.js";
|
|
6
|
-
import {
|
|
6
|
+
import { kzg } from "../../util/kzg.js";
|
|
7
7
|
import { BlobSidecarErrorCode, BlobSidecarGossipError } from "../errors/blobSidecarError.js";
|
|
8
8
|
import { GossipAction } from "../errors/gossipValidation.js";
|
|
9
9
|
import { RegenCaller } from "../regen/index.js";
|
|
@@ -132,7 +132,7 @@ export async function validateGossipBlobSidecar(fork, chain, blobSidecar, subnet
|
|
|
132
132
|
}
|
|
133
133
|
// blob, proof and commitment as a valid BLS G1 point gets verified in batch validation
|
|
134
134
|
try {
|
|
135
|
-
validateBlobsAndProofs([blobSidecar.kzgCommitment], [blobSidecar.blob], [blobSidecar.kzgProof]);
|
|
135
|
+
await validateBlobsAndProofs([blobSidecar.kzgCommitment], [blobSidecar.blob], [blobSidecar.kzgProof]);
|
|
136
136
|
}
|
|
137
137
|
catch (_e) {
|
|
138
138
|
throw new BlobSidecarGossipError(GossipAction.REJECT, {
|
|
@@ -142,7 +142,7 @@ export async function validateGossipBlobSidecar(fork, chain, blobSidecar, subnet
|
|
|
142
142
|
}
|
|
143
143
|
}
|
|
144
144
|
// https://github.com/ethereum/consensus-specs/blob/dev/specs/eip4844/beacon-chain.md#validate_blobs_sidecar
|
|
145
|
-
export function validateBlobSidecars(blockSlot, blockRoot, expectedKzgCommitments, blobSidecars, opts = { skipProofsCheck: false }) {
|
|
145
|
+
export async function validateBlobSidecars(blockSlot, blockRoot, expectedKzgCommitments, blobSidecars, opts = { skipProofsCheck: false }) {
|
|
146
146
|
// assert len(expected_kzg_commitments) == len(blobs)
|
|
147
147
|
if (expectedKzgCommitments.length !== blobSidecars.length) {
|
|
148
148
|
throw new Error(`blobSidecars length to commitments length mismatch. Blob length: ${blobSidecars.length}, Expected commitments length ${expectedKzgCommitments.length}`);
|
|
@@ -166,15 +166,15 @@ export function validateBlobSidecars(blockSlot, blockRoot, expectedKzgCommitment
|
|
|
166
166
|
proofs.push(blobSidecar.kzgProof);
|
|
167
167
|
}
|
|
168
168
|
if (!opts.skipProofsCheck) {
|
|
169
|
-
validateBlobsAndProofs(expectedKzgCommitments, blobs, proofs);
|
|
169
|
+
await validateBlobsAndProofs(expectedKzgCommitments, blobs, proofs);
|
|
170
170
|
}
|
|
171
171
|
}
|
|
172
172
|
}
|
|
173
|
-
function validateBlobsAndProofs(expectedKzgCommitments, blobs, proofs) {
|
|
173
|
+
async function validateBlobsAndProofs(expectedKzgCommitments, blobs, proofs) {
|
|
174
174
|
// assert verify_aggregate_kzg_proof(blobs, expected_kzg_commitments, kzg_aggregated_proof)
|
|
175
175
|
let isProofValid;
|
|
176
176
|
try {
|
|
177
|
-
isProofValid =
|
|
177
|
+
isProofValid = await kzg.asyncVerifyBlobKzgProofBatch(blobs, expectedKzgCommitments, proofs);
|
|
178
178
|
}
|
|
179
179
|
catch (e) {
|
|
180
180
|
e.message = `Error on verifyBlobKzgProofBatch: ${e.message}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blobSidecar.js","sourceRoot":"","sources":["../../../src/chain/validation/blobSidecar.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,oCAAoC,EACpC,6BAA6B,EAC7B,iBAAiB,GAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,kBAAkB,EAClB,uBAAuB,EACvB,kCAAkC,GACnC,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAyC,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAC,SAAS,EAAE,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AAE9D,OAAO,EAAC,eAAe,EAAC,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"blobSidecar.js","sourceRoot":"","sources":["../../../src/chain/validation/blobSidecar.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,oCAAoC,EACpC,6BAA6B,EAC7B,iBAAiB,GAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,kBAAkB,EAClB,uBAAuB,EACvB,kCAAkC,GACnC,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAyC,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAC,SAAS,EAAE,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AAE9D,OAAO,EAAC,eAAe,EAAC,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAC,GAAG,EAAC,MAAM,mBAAmB,CAAC;AACtC,OAAO,EAAC,oBAAoB,EAAE,sBAAsB,EAAC,MAAM,+BAA+B,CAAC;AAC3F,OAAO,EAAC,YAAY,EAAC,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAE9C,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,IAAc,EACd,KAAmB,EACnB,WAA8B,EAC9B,MAAgB;IAEhB,MAAM,QAAQ,GAAG,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC;IAE5D,4HAA4H;IAC5H,MAAM,gBAAgB,GAAG,KAAK,CAAC,MAAM,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC;IACxF,IAAI,WAAW,CAAC,KAAK,IAAI,gBAAgB,EAAE,CAAC;QAC1C,MAAM,IAAI,sBAAsB,CAAC,YAAY,CAAC,MAAM,EAAE;YACpD,IAAI,EAAE,oBAAoB,CAAC,eAAe;YAC1C,OAAO,EAAE,WAAW,CAAC,KAAK;YAC1B,gBAAgB;SACjB,CAAC,CAAC;IACL,CAAC;IAED,wHAAwH;IACxH,IAAI,2BAA2B,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC,KAAK,CAAC,KAAK,MAAM,EAAE,CAAC;QAClF,MAAM,IAAI,sBAAsB,CAAC,YAAY,CAAC,MAAM,EAAE;YACpD,IAAI,EAAE,oBAAoB,CAAC,aAAa;YACxC,OAAO,EAAE,WAAW,CAAC,KAAK;YAC1B,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAED,sGAAsG;IACtG,sGAAsG;IACtG,yBAAyB;IACzB,MAAM,8BAA8B,GAAG,KAAK,CAAC,KAAK,CAAC,8BAA8B,CAAC;IAClF,IAAI,8BAA8B,GAAG,QAAQ,EAAE,CAAC;QAC9C,MAAM,IAAI,sBAAsB,CAAC,YAAY,CAAC,MAAM,EAAE;YACpD,IAAI,EAAE,oBAAoB,CAAC,WAAW;YACtC,WAAW,EAAE,8BAA8B;YAC3C,SAAS,EAAE,QAAQ;SACpB,CAAC,CAAC;IACL,CAAC;IAED,mGAAmG;IACnG,+EAA+E;IAC/E,MAAM,mBAAmB,GAAG,KAAK,CAAC,UAAU,CAAC,sBAAsB,EAAE,CAAC;IACtE,MAAM,aAAa,GAAG,uBAAuB,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;IACzE,IAAI,QAAQ,IAAI,aAAa,EAAE,CAAC;QAC9B,MAAM,IAAI,sBAAsB,CAAC,YAAY,CAAC,MAAM,EAAE;YACpD,IAAI,EAAE,oBAAoB,CAAC,2BAA2B;YACtD,SAAS,EAAE,QAAQ;YACnB,aAAa;SACd,CAAC,CAAC;IACL,CAAC;IAED,sHAAsH;IACtH,EAAE;IACF,qFAAqF;IACrF,sFAAsF;IACtF,oFAAoF;IACpF,2BAA2B;IAC3B,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,iBAAiB,CAAC,YAAY,CAAC,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACnG,MAAM,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;IACtC,IAAI,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC;QACpD,MAAM,IAAI,sBAAsB,CAAC,YAAY,CAAC,MAAM,EAAE,EAAC,IAAI,EAAE,oBAAoB,CAAC,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAC,CAAC,CAAC;IACpH,CAAC;IAED,0CAA0C;IAC1C,sEAAsE;IAEtE,wGAAwG;IACxG,oGAAoG;IACpG,cAAc;IACd,MAAM,UAAU,GAAG,SAAS,CAAC,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC/E,MAAM,WAAW,GAAG,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC7D,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;QACzB,2FAA2F;QAC3F,iCAAiC;QACjC,EAAE;QACF,sFAAsF;QACtF,mFAAmF;QACnF,wDAAwD;QACxD,0FAA0F;QAC1F,sCAAsC;QACtC,sIAAsI;QACtI,kFAAkF;QAClF,MAAM,IAAI,sBAAsB,CAAC,YAAY,CAAC,MAAM,EAAE,EAAC,IAAI,EAAE,oBAAoB,CAAC,cAAc,EAAE,UAAU,EAAC,CAAC,CAAC;IACjH,CAAC;IAED,2DAA2D;IAC3D,IAAI,WAAW,CAAC,IAAI,IAAI,QAAQ,EAAE,CAAC;QACjC,MAAM,IAAI,sBAAsB,CAAC,YAAY,CAAC,MAAM,EAAE;YACpD,IAAI,EAAE,oBAAoB,CAAC,qBAAqB;YAChD,UAAU,EAAE,WAAW,CAAC,IAAI;YAC5B,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;IACL,CAAC;IAED,0GAA0G;IAC1G,8FAA8F;IAC9F,+FAA+F;IAC/F,mMAAmM;IACnM,gFAAgF;IAChF,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,KAAK;SACjC,iBAAiB,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAC,iBAAiB,EAAE,IAAI,EAAC,EAAE,WAAW,CAAC,mBAAmB,CAAC;SACnG,KAAK,CAAC,GAAG,EAAE;QACV,MAAM,IAAI,sBAAsB,CAAC,YAAY,CAAC,MAAM,EAAE,EAAC,IAAI,EAAE,oBAAoB,CAAC,cAAc,EAAE,UAAU,EAAC,CAAC,CAAC;IACjH,CAAC,CAAC,CAAC;IAEL,sHAAsH;IACtH,MAAM,YAAY,GAAG,kCAAkC,CAAC,UAAU,EAAE,WAAW,CAAC,iBAAiB,CAAC,CAAC;IACnG,6CAA6C;IAC7C,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,YAAY,CAAC,EAAE,EAAC,kBAAkB,EAAE,IAAI,EAAC,CAAC,CAAC,EAAE,CAAC;QACvF,MAAM,IAAI,sBAAsB,CAAC,YAAY,CAAC,MAAM,EAAE;YACpD,IAAI,EAAE,oBAAoB,CAAC,0BAA0B;SACtD,CAAC,CAAC;IACL,CAAC;IAED,gDAAgD;IAChD,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,sBAAsB,CAAC,YAAY,CAAC,MAAM,EAAE;YACpD,IAAI,EAAE,oBAAoB,CAAC,uBAAuB;YAClD,IAAI,EAAE,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAI;YAChD,OAAO,EAAE,WAAW,CAAC,KAAK;SAC3B,CAAC,CAAC;IACL,CAAC;IAED,0FAA0F;IAC1F,wCAAwC;IACxC,EAAE;IACF,0FAA0F;IAC1F,mDAAmD;IAEnD,kGAAkG;IAClG,2EAA2E;IAC3E,qGAAqG;IACrG,sGAAsG;IACtG,2DAA2D;IAC3D,MAAM,aAAa,GAAG,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,aAAa,CAAC;IAC1E,IAAI,UAAU,CAAC,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,CAAC,KAAK,aAAa,EAAE,CAAC;QACtE,MAAM,IAAI,sBAAsB,CAAC,YAAY,CAAC,MAAM,EAAE;YACpD,IAAI,EAAE,oBAAoB,CAAC,kBAAkB;YAC7C,aAAa;SACd,CAAC,CAAC;IACL,CAAC;IAED,uFAAuF;IACvF,IAAI,CAAC;QACH,MAAM,sBAAsB,CAAC,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;IACxG,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC;QACZ,MAAM,IAAI,sBAAsB,CAAC,YAAY,CAAC,MAAM,EAAE;YACpD,IAAI,EAAE,oBAAoB,CAAC,iBAAiB;YAC5C,OAAO,EAAE,WAAW,CAAC,KAAK;SAC3B,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,4GAA4G;AAC5G,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,SAAe,EACf,SAAe,EACf,sBAAgD,EAChD,YAAgC,EAChC,OAAmC,EAAC,eAAe,EAAE,KAAK,EAAC;IAE3D,qDAAqD;IACrD,IAAI,sBAAsB,CAAC,MAAM,KAAK,YAAY,CAAC,MAAM,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CACb,oEAAoE,YAAY,CAAC,MAAM,iCAAiC,sBAAsB,CAAC,MAAM,EAAE,CACxJ,CAAC;IACJ,CAAC;IAED,sDAAsD;IACtD,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,wCAAwC;QACxC,MAAM,KAAK,GAAG,EAAE,CAAC;QACjB,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;YACzD,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;YACxC,MAAM,eAAe,GAAG,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC;YAC9D,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,iBAAiB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;YACjF,IACE,eAAe,CAAC,IAAI,KAAK,SAAS;gBAClC,CAAC,eAAe,CAAC,aAAa,EAAE,SAAS,CAAC;gBAC1C,WAAW,CAAC,KAAK,KAAK,KAAK;gBAC3B,CAAC,eAAe,CAAC,sBAAsB,CAAC,KAAK,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,EAC1E,CAAC;gBACD,MAAM,IAAI,KAAK,CACb,0BAA0B,eAAe,CAAC,IAAI,kBAAkB,SAAS,CAAC,aAAa,CAAC,UACtF,WAAW,CAAC,KACd,4BAA4B,SAAS,CAAC,SAAS,CAAC,SAAS,SAAS,UAAU,KAAK,EAAE,CACpF,CAAC;YACJ,CAAC;YACD,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAC7B,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACpC,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;YAC1B,MAAM,sBAAsB,CAAC,sBAAsB,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACtE,CAAC;IACH,CAAC;AACH,CAAC;AAED,KAAK,UAAU,sBAAsB,CACnC,sBAAgD,EAChD,KAAkB,EAClB,MAAuB;IAEvB,2FAA2F;IAC3F,IAAI,YAAqB,CAAC;IAC1B,IAAI,CAAC;QACH,YAAY,GAAG,MAAM,GAAG,CAAC,4BAA4B,CAAC,KAAK,EAAE,sBAAsB,EAAE,MAAM,CAAC,CAAC;IAC/F,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACV,CAAW,CAAC,OAAO,GAAG,qCAAsC,CAAW,CAAC,OAAO,EAAE,CAAC;QACnF,MAAM,CAAC,CAAC;IACV,CAAC;IACD,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACjD,CAAC;AACH,CAAC;AAED,SAAS,sBAAsB,CAAC,WAA8B;IAC5D,OAAO,kBAAkB,CACvB,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,YAAY,CAAC,WAAW,CAAC,aAAa,CAAC,EAC/D,WAAW,CAAC,2BAA2B,EACvC,oCAAoC,EACpC,6BAA6B,GAAG,WAAW,CAAC,KAAK,EACjD,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAC/C,CAAC;AACJ,CAAC;AAED,SAAS,2BAA2B,CAAC,IAAc,EAAE,MAAmB,EAAE,SAAoB;IAC5F,OAAO,CACL,SAAS,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,iCAAiC,CAAC,CAAC,CAAC,MAAM,CAAC,yBAAyB,CAAC,CACpH,CAAC;AACJ,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { Root, Slot, SubnetID, deneb, fulu } from "@lodestar/types";
|
|
2
2
|
import { Metrics } from "../../metrics/metrics.js";
|
|
3
3
|
import { IBeaconChain } from "../interface.js";
|
|
4
|
-
export declare function validateGossipDataColumnSidecar(chain: IBeaconChain, dataColumnSidecar: fulu.DataColumnSidecar, gossipSubnet: SubnetID): Promise<void>;
|
|
4
|
+
export declare function validateGossipDataColumnSidecar(chain: IBeaconChain, dataColumnSidecar: fulu.DataColumnSidecar, gossipSubnet: SubnetID, metrics: Metrics | null): Promise<void>;
|
|
5
5
|
export declare function validateDataColumnsSidecars(blockSlot: Slot, blockRoot: Root, blockKzgCommitments: deneb.BlobKzgCommitments, dataColumnSidecars: fulu.DataColumnSidecars, metrics: Metrics | null, opts?: {
|
|
6
6
|
skipProofsCheck: boolean;
|
|
7
|
-
}): void
|
|
7
|
+
}): Promise<void>;
|
|
8
8
|
/**
|
|
9
9
|
* SPEC FUNCTION
|
|
10
10
|
* https://github.com/ethereum/consensus-specs/blob/dev/specs/fulu/p2p-interface.md#verify_data_column_sidecar
|
|
@@ -14,7 +14,7 @@ export declare function verifyDataColumnSidecar(dataColumnSidecar: fulu.DataColu
|
|
|
14
14
|
* SPEC FUNCTION
|
|
15
15
|
* https://github.com/ethereum/consensus-specs/blob/dev/specs/fulu/p2p-interface.md#verify_data_column_sidecar_kzg_proofs
|
|
16
16
|
*/
|
|
17
|
-
export declare function verifyDataColumnSidecarKzgProofs(commitments: Uint8Array[], cellIndices:
|
|
17
|
+
export declare function verifyDataColumnSidecarKzgProofs(commitments: Uint8Array[], cellIndices: bigint[], cells: Uint8Array[], proofs: Uint8Array[]): Promise<void>;
|
|
18
18
|
/**
|
|
19
19
|
* SPEC FUNCTION
|
|
20
20
|
* https://github.com/ethereum/consensus-specs/blob/dev/specs/fulu/p2p-interface.md#verify_data_column_sidecar_inclusion_proof
|
|
@@ -3,13 +3,13 @@ import { ssz } from "@lodestar/types";
|
|
|
3
3
|
import { toHex, toRootHex, verifyMerkleBranch } from "@lodestar/utils";
|
|
4
4
|
import { computeStartSlotAtEpoch, getBlockHeaderProposerSignatureSet } from "@lodestar/state-transition";
|
|
5
5
|
import { byteArrayEquals } from "../../util/bytes.js";
|
|
6
|
-
import {
|
|
6
|
+
import { kzg } from "../../util/kzg.js";
|
|
7
7
|
import { DataColumnSidecarErrorCode, DataColumnSidecarGossipError } from "../errors/dataColumnSidecarError.js";
|
|
8
8
|
import { GossipAction } from "../errors/gossipValidation.js";
|
|
9
9
|
import { RegenCaller } from "../regen/interface.js";
|
|
10
10
|
// SPEC FUNCTION
|
|
11
11
|
// https://github.com/ethereum/consensus-specs/blob/dev/specs/fulu/p2p-interface.md#data_column_sidecar_subnet_id
|
|
12
|
-
export async function validateGossipDataColumnSidecar(chain, dataColumnSidecar, gossipSubnet) {
|
|
12
|
+
export async function validateGossipDataColumnSidecar(chain, dataColumnSidecar, gossipSubnet, metrics) {
|
|
13
13
|
const blockHeader = dataColumnSidecar.signedBlockHeader.message;
|
|
14
14
|
// 1) [REJECT] The sidecar is valid as verified by verify_data_column_sidecar
|
|
15
15
|
verifyDataColumnSidecar(dataColumnSidecar);
|
|
@@ -100,7 +100,10 @@ export async function validateGossipDataColumnSidecar(chain, dataColumnSidecar,
|
|
|
100
100
|
// 10) [REJECT] The sidecar's kzg_commitments field inclusion proof is valid as verified by
|
|
101
101
|
// verify_data_column_sidecar_inclusion_proof
|
|
102
102
|
// TODO: Can cache result on (commitments, proof, header) in the future
|
|
103
|
-
|
|
103
|
+
const timer = metrics?.peerDas.dataColumnSidecarInclusionProofVerificationTime.startTimer();
|
|
104
|
+
const valid = verifyDataColumnSidecarInclusionProof(dataColumnSidecar);
|
|
105
|
+
timer?.();
|
|
106
|
+
if (!valid) {
|
|
104
107
|
throw new DataColumnSidecarGossipError(GossipAction.REJECT, {
|
|
105
108
|
code: DataColumnSidecarErrorCode.INCLUSION_PROOF_INVALID,
|
|
106
109
|
slot: dataColumnSidecar.signedBlockHeader.message.slot,
|
|
@@ -109,7 +112,7 @@ export async function validateGossipDataColumnSidecar(chain, dataColumnSidecar,
|
|
|
109
112
|
}
|
|
110
113
|
// 11) [REJECT] The sidecar's column data is valid as verified by verify_data_column_sidecar_kzg_proofs
|
|
111
114
|
try {
|
|
112
|
-
verifyDataColumnSidecarKzgProofs(dataColumnSidecar.kzgCommitments, Array.from({ length: dataColumnSidecar.column.length }, () => dataColumnSidecar.index), dataColumnSidecar.column, dataColumnSidecar.kzgProofs);
|
|
115
|
+
await verifyDataColumnSidecarKzgProofs(dataColumnSidecar.kzgCommitments, Array.from({ length: dataColumnSidecar.column.length }, () => BigInt(dataColumnSidecar.index)), dataColumnSidecar.column, dataColumnSidecar.kzgProofs);
|
|
113
116
|
}
|
|
114
117
|
catch {
|
|
115
118
|
throw new DataColumnSidecarGossipError(GossipAction.REJECT, {
|
|
@@ -136,7 +139,7 @@ export async function validateGossipDataColumnSidecar(chain, dataColumnSidecar,
|
|
|
136
139
|
});
|
|
137
140
|
}
|
|
138
141
|
}
|
|
139
|
-
export function validateDataColumnsSidecars(blockSlot, blockRoot, blockKzgCommitments, dataColumnSidecars, metrics, opts = { skipProofsCheck: false }) {
|
|
142
|
+
export async function validateDataColumnsSidecars(blockSlot, blockRoot, blockKzgCommitments, dataColumnSidecars, metrics, opts = { skipProofsCheck: false }) {
|
|
140
143
|
const commitmentBytes = [];
|
|
141
144
|
const cellIndices = [];
|
|
142
145
|
const cells = [];
|
|
@@ -163,7 +166,7 @@ export function validateDataColumnsSidecars(blockSlot, blockRoot, blockKzgCommit
|
|
|
163
166
|
throw new Error(`Invalid data sidecar array lengths for columnIndex=${columnIndex} in slot=${blockSlot} blockRoot=${toHex(blockRoot)}`);
|
|
164
167
|
}
|
|
165
168
|
commitmentBytes.push(...kzgCommitments);
|
|
166
|
-
cellIndices.push(...Array.from({ length: column.length }, () => columnIndex));
|
|
169
|
+
cellIndices.push(...Array.from({ length: column.length }, () => BigInt(columnIndex)));
|
|
167
170
|
cells.push(...column);
|
|
168
171
|
proofBytes.push(...kzgProofs);
|
|
169
172
|
}
|
|
@@ -173,7 +176,7 @@ export function validateDataColumnsSidecars(blockSlot, blockRoot, blockKzgCommit
|
|
|
173
176
|
let valid;
|
|
174
177
|
try {
|
|
175
178
|
const timer = metrics?.peerDas.kzgVerificationDataColumnBatchTime.startTimer();
|
|
176
|
-
valid =
|
|
179
|
+
valid = await kzg.asyncVerifyCellKzgProofBatch(commitmentBytes, cellIndices, cells, proofBytes);
|
|
177
180
|
timer?.();
|
|
178
181
|
}
|
|
179
182
|
catch (err) {
|
|
@@ -215,10 +218,10 @@ export function verifyDataColumnSidecar(dataColumnSidecar) {
|
|
|
215
218
|
* SPEC FUNCTION
|
|
216
219
|
* https://github.com/ethereum/consensus-specs/blob/dev/specs/fulu/p2p-interface.md#verify_data_column_sidecar_kzg_proofs
|
|
217
220
|
*/
|
|
218
|
-
export function verifyDataColumnSidecarKzgProofs(commitments, cellIndices, cells, proofs) {
|
|
221
|
+
export async function verifyDataColumnSidecarKzgProofs(commitments, cellIndices, cells, proofs) {
|
|
219
222
|
let valid;
|
|
220
223
|
try {
|
|
221
|
-
valid =
|
|
224
|
+
valid = await kzg.verifyCellKzgProofBatch(commitments, cellIndices, cells, proofs);
|
|
222
225
|
}
|
|
223
226
|
catch (e) {
|
|
224
227
|
e.message = `Error on verifyCellKzgProofBatch: ${e.message}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dataColumnSidecar.js","sourceRoot":"","sources":["../../../src/chain/validation/dataColumnSidecar.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gCAAgC,EAChC,qCAAqC,EACrC,6BAA6B,EAC7B,iBAAiB,GAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAoC,GAAG,EAAC,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAC,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AAErE,OAAO,EAAC,uBAAuB,EAAE,kCAAkC,EAAC,MAAM,4BAA4B,CAAC;AAEvG,OAAO,EAAC,eAAe,EAAC,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"dataColumnSidecar.js","sourceRoot":"","sources":["../../../src/chain/validation/dataColumnSidecar.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ import { fromHex, toHex } from "@lodestar/utils";
|
|
|
5
5
|
import { ZERO_HASH_HEX } from "../../constants/index.js";
|
|
6
6
|
import { quantityToNum } from "../../eth1/provider/utils.js";
|
|
7
7
|
import { kzgCommitmentToVersionedHash } from "../../util/blobs.js";
|
|
8
|
-
import {
|
|
8
|
+
import { kzg } from "../../util/kzg.js";
|
|
9
9
|
import { ClientCode, ExecutionPayloadStatus, PayloadIdCache } from "./interface.js";
|
|
10
10
|
import { deserializePayloadAttributes, serializeBlobsBundle, serializeExecutionPayload, } from "./types.js";
|
|
11
11
|
const INTEROP_GAS_LIMIT = 30e6;
|
|
@@ -234,8 +234,8 @@ export class ExecutionEngineMockBackend {
|
|
|
234
234
|
const denebTxCount = Math.round(2 * Math.random());
|
|
235
235
|
for (let i = 0; i < denebTxCount; i++) {
|
|
236
236
|
const blob = generateRandomBlob();
|
|
237
|
-
const commitment =
|
|
238
|
-
const proof =
|
|
237
|
+
const commitment = kzg.blobToKzgCommitment(blob);
|
|
238
|
+
const proof = kzg.computeBlobKzgProof(blob, commitment);
|
|
239
239
|
executionPayload.transactions.push(transactionForKzgCommitment(commitment));
|
|
240
240
|
commitments.push(commitment);
|
|
241
241
|
blobs.push(blob);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mock.js","sourceRoot":"","sources":["../../../src/execution/engine/mock.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EACL,YAAY,EACZ,uBAAuB,EACvB,uBAAuB,EACvB,QAAQ,EAER,OAAO,GACR,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAA4B,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAC,OAAO,EAAE,KAAK,EAAC,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAC,aAAa,EAAC,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAC,4BAA4B,EAAC,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"mock.js","sourceRoot":"","sources":["../../../src/execution/engine/mock.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,9 @@ export declare function createBeaconMetrics(register: RegistryMetricCreator): {
|
|
|
21
21
|
currentValidators: import("@lodestar/utils").GaugeExtra<{
|
|
22
22
|
status: string;
|
|
23
23
|
}>;
|
|
24
|
+
pendingDeposits: import("@lodestar/utils").GaugeExtra<import("@lodestar/utils").NoLabels>;
|
|
25
|
+
pendingConsolidations: import("@lodestar/utils").GaugeExtra<import("@lodestar/utils").NoLabels>;
|
|
26
|
+
pendingPartialWithdrawals: import("@lodestar/utils").GaugeExtra<import("@lodestar/utils").NoLabels>;
|
|
24
27
|
forkChoice: {
|
|
25
28
|
findHead: import("@lodestar/utils").Histogram<{
|
|
26
29
|
caller: string;
|
|
@@ -122,6 +125,10 @@ export declare function createBeaconMetrics(register: RegistryMetricCreator): {
|
|
|
122
125
|
dataColumnSidecarComputationTime: import("@lodestar/utils").Histogram<import("@lodestar/utils").NoLabels>;
|
|
123
126
|
dataColumnSidecarInclusionProofVerificationTime: import("@lodestar/utils").Histogram<import("@lodestar/utils").NoLabels>;
|
|
124
127
|
kzgVerificationDataColumnBatchTime: import("@lodestar/utils").Histogram<import("@lodestar/utils").NoLabels>;
|
|
128
|
+
getBlobsV2Requests: import("@lodestar/utils").Counter<import("@lodestar/utils").NoLabels>;
|
|
129
|
+
getBlobsV2Responses: import("@lodestar/utils").Counter<import("@lodestar/utils").NoLabels>;
|
|
130
|
+
getBlobsV2RequestDuration: import("@lodestar/utils").Histogram<import("@lodestar/utils").NoLabels>;
|
|
131
|
+
custodyGroupCount: import("@lodestar/utils").GaugeExtra<import("@lodestar/utils").NoLabels>;
|
|
125
132
|
};
|
|
126
133
|
clockSlot: import("@lodestar/utils").GaugeExtra<import("@lodestar/utils").NoLabels>;
|
|
127
134
|
clockEpoch: import("@lodestar/utils").GaugeExtra<import("@lodestar/utils").NoLabels>;
|
|
@@ -43,6 +43,18 @@ export function createBeaconMetrics(register) {
|
|
|
43
43
|
labelNames: ["status"],
|
|
44
44
|
help: "number of validators in current epoch",
|
|
45
45
|
}),
|
|
46
|
+
pendingDeposits: register.gauge({
|
|
47
|
+
name: "beacon_pending_deposits",
|
|
48
|
+
help: "Current number of pending deposits",
|
|
49
|
+
}),
|
|
50
|
+
pendingConsolidations: register.gauge({
|
|
51
|
+
name: "beacon_pending_consolidations",
|
|
52
|
+
help: "Current number of pending consolidations",
|
|
53
|
+
}),
|
|
54
|
+
pendingPartialWithdrawals: register.gauge({
|
|
55
|
+
name: "beacon_pending_partial_withdrawals",
|
|
56
|
+
help: "Current number of pending partial withdrawals",
|
|
57
|
+
}),
|
|
46
58
|
// Non-spec'ed
|
|
47
59
|
forkChoice: {
|
|
48
60
|
findHead: register.histogram({
|
|
@@ -190,6 +202,7 @@ export function createBeaconMetrics(register) {
|
|
|
190
202
|
name: "beacon_block_payload_fetched_time",
|
|
191
203
|
help: "Time to fetch the payload from EL",
|
|
192
204
|
labelNames: ["prepType"],
|
|
205
|
+
buckets: [0.1, 0.2, 0.3, 0.5, 0.7, 1, 2],
|
|
193
206
|
}),
|
|
194
207
|
emptyPayloads: register.gauge({
|
|
195
208
|
name: "beacon_block_payload_empty_total",
|
|
@@ -335,19 +348,39 @@ export function createBeaconMetrics(register) {
|
|
|
335
348
|
dataColumnSidecarGossipVerificationTime: register.histogram({
|
|
336
349
|
name: "beacon_data_column_sidecar_gossip_verification_seconds",
|
|
337
350
|
help: "Full runtime of data column sidecars gossip verification",
|
|
351
|
+
buckets: [0.025, 0.05, 0.1, 0.5, 1, 2, 5],
|
|
338
352
|
}),
|
|
339
353
|
dataColumnSidecarComputationTime: register.histogram({
|
|
340
354
|
name: "beacon_data_column_sidecar_computation_seconds",
|
|
341
355
|
help: "Time taken to compute data column sidecars, including cells and inclusion proof",
|
|
356
|
+
buckets: [0.1, 0.25, 0.5, 0.75, 1, 2, 5],
|
|
342
357
|
}),
|
|
343
358
|
dataColumnSidecarInclusionProofVerificationTime: register.histogram({
|
|
344
359
|
name: "beacon_data_column_sidecar_inclusion_proof_verification_seconds",
|
|
345
360
|
help: "Time taken to verify data_column sidecar inclusion proof",
|
|
361
|
+
buckets: [0.002, 0.004, 0.006, 0.008, 0.01, 0.05, 1, 2],
|
|
346
362
|
}),
|
|
347
363
|
kzgVerificationDataColumnBatchTime: register.histogram({
|
|
348
364
|
name: "beacon_kzg_verification_data_column_batch_seconds",
|
|
349
365
|
help: "Runtime of batched data column kzg verification",
|
|
350
|
-
buckets: [0.
|
|
366
|
+
buckets: [0.025, 0.05, 0.1, 0.2, 0.3, 0.4, 0.5, 1, 2, 5],
|
|
367
|
+
}),
|
|
368
|
+
getBlobsV2Requests: register.counter({
|
|
369
|
+
name: "beacon_engine_getBlobsV2_requests_total",
|
|
370
|
+
help: "Total number of engine_getBlobsV2 requests sent",
|
|
371
|
+
}),
|
|
372
|
+
getBlobsV2Responses: register.counter({
|
|
373
|
+
name: "beacon_engine_getBlobsV2_responses_total",
|
|
374
|
+
help: "Total number of engine_getBlobsV2 successful responses received",
|
|
375
|
+
}),
|
|
376
|
+
getBlobsV2RequestDuration: register.histogram({
|
|
377
|
+
name: "beacon_engine_getBlobsV2_request_duration_seconds",
|
|
378
|
+
help: "Duration of engine_getBlobsV2 requests",
|
|
379
|
+
buckets: [0.01, 0.05, 0.1, 0.5, 1, 2.5, 5, 7.5],
|
|
380
|
+
}),
|
|
381
|
+
custodyGroupCount: register.gauge({
|
|
382
|
+
name: "beacon_custody_groups",
|
|
383
|
+
help: "Total number of custody groups within a node",
|
|
351
384
|
}),
|
|
352
385
|
},
|
|
353
386
|
// Non-spec'ed
|