@lodestar/beacon-node 1.31.0-dev.fa41ea44de → 1.31.0-peerDAS.0a673a00bb
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 +42 -14
- package/lib/api/impl/beacon/blocks/index.js.map +1 -1
- package/lib/api/impl/beacon/rewards/index.js +3 -0
- package/lib/api/impl/beacon/rewards/index.js.map +1 -1
- package/lib/api/impl/beacon/state/index.js +5 -0
- package/lib/api/impl/beacon/state/index.js.map +1 -1
- package/lib/api/impl/config/index.js +5 -0
- package/lib/api/impl/config/index.js.map +1 -1
- package/lib/api/impl/utils.d.ts +9 -0
- package/lib/api/impl/utils.js +23 -0
- package/lib/api/impl/utils.js.map +1 -0
- package/lib/api/impl/validator/index.js +2 -1
- package/lib/api/impl/validator/index.js.map +1 -1
- package/lib/chain/archiveStore/archiveStore.d.ts +1 -1
- package/lib/chain/archiveStore/archiveStore.js +2 -2
- package/lib/chain/archiveStore/historicalState/getHistoricalState.d.ts +1 -1
- package/lib/chain/archiveStore/historicalState/getHistoricalState.js.map +1 -1
- package/lib/chain/archiveStore/historicalState/metrics.d.ts +22 -0
- package/lib/chain/archiveStore/historicalState/metrics.js +173 -0
- package/lib/chain/archiveStore/historicalState/metrics.js.map +1 -0
- package/lib/chain/archiveStore/historicalState/types.d.ts +0 -14
- package/lib/chain/archiveStore/historicalState/types.js.map +1 -1
- package/lib/chain/archiveStore/historicalState/worker.js +3 -163
- package/lib/chain/archiveStore/historicalState/worker.js.map +1 -1
- package/lib/chain/archiveStore/interface.d.ts +1 -1
- package/lib/chain/archiveStore/utils/archiveBlocks.d.ts +1 -1
- package/lib/chain/archiveStore/utils/archiveBlocks.js +88 -23
- package/lib/chain/archiveStore/utils/archiveBlocks.js.map +1 -1
- package/lib/chain/beaconProposerCache.d.ts +1 -0
- package/lib/chain/beaconProposerCache.js +3 -0
- package/lib/chain/beaconProposerCache.js.map +1 -1
- package/lib/chain/blocks/blockInput/blockInput.d.ts +4 -2
- package/lib/chain/blocks/blockInput/blockInput.js +28 -12
- package/lib/chain/blocks/blockInput/blockInput.js.map +1 -1
- package/lib/chain/blocks/blockInput/index.d.ts +1 -0
- package/lib/chain/blocks/blockInput/index.js +1 -0
- package/lib/chain/blocks/blockInput/index.js.map +1 -1
- package/lib/chain/blocks/blockInput/types.d.ts +2 -1
- package/lib/chain/blocks/blockInput/utils.d.ts +9 -0
- package/lib/chain/blocks/blockInput/utils.js +35 -0
- package/lib/chain/blocks/blockInput/utils.js.map +1 -0
- package/lib/chain/blocks/importBlock.d.ts +5 -0
- package/lib/chain/blocks/importBlock.js +81 -15
- package/lib/chain/blocks/importBlock.js.map +1 -1
- package/lib/chain/blocks/types.d.ts +65 -24
- package/lib/chain/blocks/types.js +39 -6
- package/lib/chain/blocks/types.js.map +1 -1
- package/lib/chain/blocks/verifyBlocksDataAvailability.js +21 -10
- package/lib/chain/blocks/verifyBlocksDataAvailability.js.map +1 -1
- package/lib/chain/blocks/writeBlockInputToDb.js +89 -15
- package/lib/chain/blocks/writeBlockInputToDb.js.map +1 -1
- package/lib/chain/chain.d.ts +14 -4
- package/lib/chain/chain.js +31 -4
- package/lib/chain/chain.js.map +1 -1
- package/lib/chain/emitter.d.ts +18 -2
- package/lib/chain/emitter.js +13 -0
- package/lib/chain/emitter.js.map +1 -1
- package/lib/chain/errors/dataColumnSidecarError.d.ts +69 -0
- package/lib/chain/errors/dataColumnSidecarError.js +21 -0
- package/lib/chain/errors/dataColumnSidecarError.js.map +1 -0
- package/lib/chain/errors/index.d.ts +1 -0
- package/lib/chain/errors/index.js +1 -0
- package/lib/chain/errors/index.js.map +1 -1
- package/lib/chain/interface.d.ts +11 -3
- package/lib/chain/interface.js.map +1 -1
- package/lib/chain/opPools/aggregatedAttestationPool.d.ts +20 -14
- package/lib/chain/opPools/aggregatedAttestationPool.js +41 -49
- package/lib/chain/opPools/aggregatedAttestationPool.js.map +1 -1
- package/lib/chain/opPools/syncContributionAndProofPool.d.ts +11 -4
- package/lib/chain/opPools/syncContributionAndProofPool.js +50 -8
- package/lib/chain/opPools/syncContributionAndProofPool.js.map +1 -1
- package/lib/chain/opPools/types.d.ts +1 -1
- package/lib/chain/opPools/types.js +1 -1
- package/lib/chain/opPools/types.js.map +1 -1
- package/lib/chain/options.d.ts +4 -1
- package/lib/chain/options.js +4 -0
- package/lib/chain/options.js.map +1 -1
- package/lib/chain/produceBlock/produceBlockBody.d.ts +4 -2
- package/lib/chain/produceBlock/produceBlockBody.js +11 -2
- package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
- package/lib/chain/produceBlock/validateBlobsAndKzgCommitments.d.ts +3 -2
- package/lib/chain/produceBlock/validateBlobsAndKzgCommitments.js +31 -2
- package/lib/chain/produceBlock/validateBlobsAndKzgCommitments.js.map +1 -1
- package/lib/chain/seenCache/seenAggregateAndProof.d.ts +3 -3
- package/lib/chain/seenCache/seenAggregateAndProof.js +12 -6
- package/lib/chain/seenCache/seenAggregateAndProof.js.map +1 -1
- package/lib/chain/seenCache/seenBlockInput.d.ts +84 -0
- package/lib/chain/seenCache/seenBlockInput.js +225 -0
- package/lib/chain/seenCache/seenBlockInput.js.map +1 -0
- package/lib/chain/seenCache/seenGossipBlockInput.d.ts +61 -18
- package/lib/chain/seenCache/seenGossipBlockInput.js +254 -53
- package/lib/chain/seenCache/seenGossipBlockInput.js.map +1 -1
- package/lib/chain/validation/aggregateAndProof.js +2 -2
- package/lib/chain/validation/aggregateAndProof.js.map +1 -1
- package/lib/chain/validation/dataColumnSidecar.d.ts +28 -0
- package/lib/chain/validation/dataColumnSidecar.js +245 -0
- package/lib/chain/validation/dataColumnSidecar.js.map +1 -0
- package/lib/db/beacon.d.ts +3 -1
- package/lib/db/beacon.js +3 -1
- package/lib/db/beacon.js.map +1 -1
- package/lib/db/buckets.d.ts +3 -1
- package/lib/db/buckets.js +2 -0
- package/lib/db/buckets.js.map +1 -1
- package/lib/db/interface.d.ts +3 -1
- package/lib/db/repositories/dataColumnSidecars.d.ts +47 -0
- package/lib/db/repositories/dataColumnSidecars.js +40 -0
- package/lib/db/repositories/dataColumnSidecars.js.map +1 -0
- package/lib/db/repositories/dataColumnSidecarsArchive.d.ts +15 -0
- package/lib/db/repositories/dataColumnSidecarsArchive.js +23 -0
- package/lib/db/repositories/dataColumnSidecarsArchive.js.map +1 -0
- package/lib/db/repositories/index.d.ts +2 -0
- package/lib/db/repositories/index.js +2 -0
- package/lib/db/repositories/index.js.map +1 -1
- package/lib/execution/engine/http.d.ts +5 -3
- package/lib/execution/engine/http.js +70 -31
- package/lib/execution/engine/http.js.map +1 -1
- package/lib/execution/engine/interface.d.ts +4 -2
- package/lib/execution/engine/interface.js +1 -1
- package/lib/execution/engine/interface.js.map +1 -1
- package/lib/execution/engine/mock.d.ts +1 -0
- package/lib/execution/engine/mock.js +5 -0
- package/lib/execution/engine/mock.js.map +1 -1
- package/lib/execution/engine/types.d.ts +10 -0
- package/lib/execution/engine/types.js +6 -0
- package/lib/execution/engine/types.js.map +1 -1
- package/lib/metrics/metrics/beacon.d.ts +8 -0
- package/lib/metrics/metrics/beacon.js +27 -0
- package/lib/metrics/metrics/beacon.js.map +1 -1
- package/lib/metrics/metrics/lodestar.d.ts +36 -3
- package/lib/metrics/metrics/lodestar.js +71 -4
- package/lib/metrics/metrics/lodestar.js.map +1 -1
- package/lib/network/core/metrics.d.ts +10 -3
- package/lib/network/core/metrics.js +22 -4
- package/lib/network/core/metrics.js.map +1 -1
- package/lib/network/core/networkCore.d.ts +6 -0
- package/lib/network/core/networkCore.js +20 -8
- package/lib/network/core/networkCore.js.map +1 -1
- package/lib/network/core/networkCoreWorker.js +2 -0
- package/lib/network/core/networkCoreWorker.js.map +1 -1
- package/lib/network/core/networkCoreWorkerHandler.d.ts +2 -0
- package/lib/network/core/networkCoreWorkerHandler.js +7 -0
- package/lib/network/core/networkCoreWorkerHandler.js.map +1 -1
- package/lib/network/core/types.d.ts +4 -0
- package/lib/network/events.d.ts +3 -1
- package/lib/network/events.js.map +1 -1
- package/lib/network/gossip/interface.d.ts +8 -1
- package/lib/network/gossip/interface.js +1 -0
- package/lib/network/gossip/interface.js.map +1 -1
- package/lib/network/gossip/topic.d.ts +1047 -1031
- package/lib/network/gossip/topic.js +20 -1
- package/lib/network/gossip/topic.js.map +1 -1
- package/lib/network/interface.d.ts +13 -1
- package/lib/network/metadata.d.ts +10 -6
- package/lib/network/metadata.js +23 -4
- package/lib/network/metadata.js.map +1 -1
- package/lib/network/network.d.ts +12 -1
- package/lib/network/network.js +57 -4
- package/lib/network/network.js.map +1 -1
- package/lib/network/networkConfig.d.ts +23 -0
- package/lib/network/networkConfig.js +32 -0
- package/lib/network/networkConfig.js.map +1 -0
- package/lib/network/options.js +2 -0
- package/lib/network/options.js.map +1 -1
- package/lib/network/peers/discover.d.ts +16 -3
- package/lib/network/peers/discover.js +139 -13
- package/lib/network/peers/discover.js.map +1 -1
- package/lib/network/peers/peerManager.d.ts +10 -2
- package/lib/network/peers/peerManager.js +96 -10
- package/lib/network/peers/peerManager.js.map +1 -1
- package/lib/network/peers/peersData.d.ts +8 -2
- package/lib/network/peers/peersData.js.map +1 -1
- package/lib/network/peers/score/interface.d.ts +1 -1
- package/lib/network/peers/score/score.d.ts +2 -2
- package/lib/network/peers/score/score.js +4 -1
- package/lib/network/peers/score/score.js.map +1 -1
- package/lib/network/peers/score/store.d.ts +3 -1
- package/lib/network/peers/score/store.js +6 -2
- package/lib/network/peers/score/store.js.map +1 -1
- package/lib/network/peers/utils/prioritizePeers.d.ts +15 -4
- package/lib/network/peers/utils/prioritizePeers.js +30 -5
- package/lib/network/peers/utils/prioritizePeers.js.map +1 -1
- package/lib/network/processor/extractSlotRootFns.js +8 -1
- package/lib/network/processor/extractSlotRootFns.js.map +1 -1
- package/lib/network/processor/gossipHandlers.js +156 -9
- package/lib/network/processor/gossipHandlers.js.map +1 -1
- package/lib/network/processor/gossipQueues/index.js +5 -0
- package/lib/network/processor/gossipQueues/index.js.map +1 -1
- package/lib/network/processor/index.js +1 -0
- package/lib/network/processor/index.js.map +1 -1
- package/lib/network/reqresp/ReqRespBeaconNode.js +21 -3
- package/lib/network/reqresp/ReqRespBeaconNode.js.map +1 -1
- package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.d.ts +14 -5
- package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.js +199 -14
- package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.js.map +1 -1
- package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.d.ts +32 -5
- package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.js +280 -26
- package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.js.map +1 -1
- package/lib/network/reqresp/handlers/beaconBlocksByRange.d.ts +1 -1
- package/lib/network/reqresp/handlers/beaconBlocksByRange.js.map +1 -1
- package/lib/network/reqresp/handlers/dataColumnSidecarsByRange.d.ts +8 -0
- package/lib/network/reqresp/handlers/dataColumnSidecarsByRange.js +106 -0
- package/lib/network/reqresp/handlers/dataColumnSidecarsByRange.js.map +1 -0
- package/lib/network/reqresp/handlers/dataColumnSidecarsByRoot.d.ts +6 -0
- package/lib/network/reqresp/handlers/dataColumnSidecarsByRoot.js +57 -0
- package/lib/network/reqresp/handlers/dataColumnSidecarsByRoot.js.map +1 -0
- package/lib/network/reqresp/handlers/index.js +10 -0
- package/lib/network/reqresp/handlers/index.js.map +1 -1
- package/lib/network/reqresp/protocols.d.ts +3 -0
- package/lib/network/reqresp/protocols.js +15 -0
- package/lib/network/reqresp/protocols.js.map +1 -1
- package/lib/network/reqresp/rateLimit.js +11 -1
- package/lib/network/reqresp/rateLimit.js.map +1 -1
- package/lib/network/reqresp/types.d.ts +13 -6
- package/lib/network/reqresp/types.js +9 -2
- package/lib/network/reqresp/types.js.map +1 -1
- package/lib/network/subnets/interface.d.ts +3 -0
- package/lib/network/subnets/interface.js +14 -1
- package/lib/network/subnets/interface.js.map +1 -1
- package/lib/network/subnets/syncnetsService.js +4 -5
- package/lib/network/subnets/syncnetsService.js.map +1 -1
- package/lib/node/nodejs.js +4 -3
- package/lib/node/nodejs.js.map +1 -1
- package/lib/sync/interface.d.ts +2 -2
- package/lib/sync/interface.js +1 -1
- package/lib/sync/interface.js.map +1 -1
- package/lib/sync/range/batch.d.ts +8 -2
- package/lib/sync/range/batch.js +19 -7
- package/lib/sync/range/batch.js.map +1 -1
- package/lib/sync/range/chain.d.ts +7 -2
- package/lib/sync/range/chain.js +45 -21
- package/lib/sync/range/chain.js.map +1 -1
- package/lib/sync/range/range.js +3 -3
- package/lib/sync/range/range.js.map +1 -1
- package/lib/sync/range/utils/peerBalancer.d.ts +4 -1
- package/lib/sync/range/utils/peerBalancer.js +20 -2
- package/lib/sync/range/utils/peerBalancer.js.map +1 -1
- package/lib/sync/unknownBlock.d.ts +8 -1
- package/lib/sync/unknownBlock.js +222 -62
- package/lib/sync/unknownBlock.js.map +1 -1
- package/lib/util/blobs.d.ts +13 -1
- package/lib/util/blobs.js +44 -1
- package/lib/util/blobs.js.map +1 -1
- package/lib/util/dataColumns.d.ts +111 -0
- package/lib/util/dataColumns.js +277 -0
- package/lib/util/dataColumns.js.map +1 -0
- package/lib/util/kzg.d.ts +9 -21
- package/lib/util/kzg.js +12 -88
- package/lib/util/kzg.js.map +1 -1
- package/lib/util/metadata.d.ts +4 -0
- package/lib/util/metadata.js +7 -0
- package/lib/util/metadata.js.map +1 -1
- package/lib/util/sszBytes.d.ts +1 -0
- package/lib/util/sszBytes.js +17 -0
- package/lib/util/sszBytes.js.map +1 -1
- package/package.json +18 -18
|
@@ -100,7 +100,11 @@ export class ReqRespBeaconNode extends ReqResp {
|
|
|
100
100
|
async sendMetadata(peerId) {
|
|
101
101
|
return collectExactOneTyped(this.sendReqRespRequest(peerId, ReqRespMethod.Metadata,
|
|
102
102
|
// Before altair, prioritize V2. After altair only request V2
|
|
103
|
-
this.currentRegisteredFork >= ForkSeq.
|
|
103
|
+
this.currentRegisteredFork >= ForkSeq.fulu
|
|
104
|
+
? [Version.V3]
|
|
105
|
+
: this.currentRegisteredFork >= ForkSeq.altair
|
|
106
|
+
? [Version.V3, Version.V2]
|
|
107
|
+
: [(Version.V3, Version.V2, Version.V1)], null), responseSszTypeByMethod[ReqRespMethod.Metadata]);
|
|
104
108
|
}
|
|
105
109
|
sendReqRespRequest(peerId, method, versions, request) {
|
|
106
110
|
const fork = ForkName[ForkSeq[this.currentRegisteredFork]];
|
|
@@ -117,9 +121,10 @@ export class ReqRespBeaconNode extends ReqResp {
|
|
|
117
121
|
[protocols.Ping(fork, this.config), this.onPing.bind(this)],
|
|
118
122
|
[protocols.Status(fork, this.config), this.onStatus.bind(this)],
|
|
119
123
|
[protocols.Goodbye(fork, this.config), this.onGoodbye.bind(this)],
|
|
120
|
-
// Support
|
|
124
|
+
// Support V3 methods as soon as implemented (for fulu)
|
|
125
|
+
// Follows pattern for altair:
|
|
121
126
|
// Ref https://github.com/ethereum/consensus-specs/blob/v1.2.0/specs/altair/p2p-interface.md#transitioning-from-v1-to-v2
|
|
122
|
-
[protocols.
|
|
127
|
+
[protocols.MetadataV3(fork, this.config), this.onMetadata.bind(this)],
|
|
123
128
|
[protocols.BeaconBlocksByRangeV2(fork, this.config), this.getHandler(ReqRespMethod.BeaconBlocksByRange)],
|
|
124
129
|
[protocols.BeaconBlocksByRootV2(fork, this.config), this.getHandler(ReqRespMethod.BeaconBlocksByRoot)],
|
|
125
130
|
];
|
|
@@ -127,6 +132,10 @@ export class ReqRespBeaconNode extends ReqResp {
|
|
|
127
132
|
// Unregister V1 topics at the fork boundary, so only declare for pre-altair
|
|
128
133
|
protocolsAtFork.push([protocols.Metadata(fork, this.config), this.onMetadata.bind(this)], [protocols.BeaconBlocksByRange(fork, this.config), this.getHandler(ReqRespMethod.BeaconBlocksByRange)], [protocols.BeaconBlocksByRoot(fork, this.config), this.getHandler(ReqRespMethod.BeaconBlocksByRoot)]);
|
|
129
134
|
}
|
|
135
|
+
if (ForkSeq[fork] < ForkSeq.fulu) {
|
|
136
|
+
// Unregister MetadataV2 at the fork boundary, so only declare for pre-fulu
|
|
137
|
+
protocolsAtFork.push([protocols.MetadataV2(fork, this.config), this.onMetadata.bind(this)]);
|
|
138
|
+
}
|
|
130
139
|
if (ForkSeq[fork] >= ForkSeq.altair && !this.disableLightClientServer) {
|
|
131
140
|
// Should be okay to enable before altair, but for consistency only enable afterwards
|
|
132
141
|
protocolsAtFork.push([protocols.LightClientBootstrap(fork, this.config), this.getHandler(ReqRespMethod.LightClientBootstrap)], [
|
|
@@ -143,6 +152,15 @@ export class ReqRespBeaconNode extends ReqResp {
|
|
|
143
152
|
if (ForkSeq[fork] >= ForkSeq.deneb) {
|
|
144
153
|
protocolsAtFork.push([protocols.BlobSidecarsByRoot(fork, this.config), this.getHandler(ReqRespMethod.BlobSidecarsByRoot)], [protocols.BlobSidecarsByRange(fork, this.config), this.getHandler(ReqRespMethod.BlobSidecarsByRange)]);
|
|
145
154
|
}
|
|
155
|
+
if (ForkSeq[fork] >= ForkSeq.fulu) {
|
|
156
|
+
protocolsAtFork.push([
|
|
157
|
+
protocols.DataColumnSidecarsByRoot(fork, this.config),
|
|
158
|
+
this.getHandler(ReqRespMethod.DataColumnSidecarsByRoot),
|
|
159
|
+
], [
|
|
160
|
+
protocols.DataColumnSidecarsByRange(fork, this.config),
|
|
161
|
+
this.getHandler(ReqRespMethod.DataColumnSidecarsByRange),
|
|
162
|
+
]);
|
|
163
|
+
}
|
|
146
164
|
return protocolsAtFork;
|
|
147
165
|
}
|
|
148
166
|
onIncomingRequestBody(request, peer) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReqRespBeaconNode.js","sourceRoot":"","sources":["../../../src/network/reqresp/ReqRespBeaconNode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,QAAQ,EAAE,OAAO,EAAC,MAAM,kBAAkB,CAAC;AACnD,OAAO,EACL,QAAQ,EAGR,OAAO,GAMR,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAmB,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAGtD,OAAO,EAAC,mBAAmB,EAAC,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAAmB,YAAY,EAAC,MAAM,cAAc,CAAC;AAG5D,OAAO,EAAqB,UAAU,EAAC,MAAM,yBAAyB,CAAC;AAEvE,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAC,sBAAsB,EAAC,MAAM,YAAY,CAAC;AAClD,OAAO,EAGL,aAAa,EAEb,OAAO,EACP,sBAAsB,EACtB,uBAAuB,GACxB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAC,oBAAoB,EAAC,MAAM,oBAAoB,CAAC;AAExD,OAAO,EAAC,kBAAkB,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAC,aAAa,EAA6B,MAAM,YAAY,CAAC;AAiBrE;;;;;GAKG;AACH,MAAM,OAAO,iBAAkB,SAAQ,OAAO;IAe5C,YAAY,OAAiC,EAAE,UAAiC,EAAE;QAChF,MAAM,EAAC,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAC,GAAG,OAAO,CAAC;QAE9E,KAAK,CACH;YACE,GAAG,OAAO;YACV,eAAe,EAAE,OAAO,EAAE,QAAQ,IAAI,IAAI;SAC3C,EACD;YACE,GAAG,OAAO;YACV,WAAW,CAAC,MAAM,EAAE,MAAM;gBACxB,MAAM,CAAC,KAAK,CAAC,wCAAwC,EAAE,EAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAC,CAAC,CAAC;gBACpF,aAAa,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;gBACtE,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,EAAC,MAAM,EAAC,CAAC,CAAC;YACjD,CAAC;YACD,kBAAkB,CAAC,MAAM;gBACvB,mFAAmF;gBACnF,OAAO,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;YAC5E,CAAC;SACF,CACF,CAAC;QA3BJ,4DAA4D;QACpD,0BAAqB,GAAY,OAAO,CAAC,MAAM,CAAC;QA4BtD,IAAI,CAAC,wBAAwB,GAAG,OAAO,CAAC,wBAAwB,IAAI,KAAK,CAAC;QAC1E,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,kBAAkB,GAAG,QAAQ,CAAC;QACnC,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC;QAC9B,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACvC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC;IAED,wFAAwF;IACxF,gDAAgD;IAChD,oCAAoC;IAEpC,uBAAuB,CAAC,IAAc;QACpC,IAAI,CAAC,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAE3C,MAAM,sBAAsB,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC7D,MAAM,wBAAwB,GAAG,IAAI,GAAG,CACtC,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAC5E,CAAC;QAEF,sCAAsC;QACtC,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,sBAAsB,EAAE,EAAE,CAAC;YACvD,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC9C,+DAA+D;gBAC/D,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;oBAC9C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,EAAE,EAAC,UAAU,EAAC,EAAE,CAAC,CAAC,CAAC;gBAC5E,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,+BAA+B;QAC/B,KAAK,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,sBAAsB,EAAE,CAAC;YACzD,IAAI,CAAC,gBAAgB,CAAC,EAAC,GAAG,QAAQ,EAAE,OAAO,EAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBACxD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,EAAC,UAAU,EAAE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAC,EAAE,CAAC,CAAC,CAAC;YAC3G,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,0BAA0B,CACxB,MAAc,EACd,MAAqB,EACrB,QAAkB,EAClB,WAAuB;QAEvB,8BAA8B;QAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC;QAEhG,iFAAiF;QACjF,IAAI,MAAM,KAAK,aAAa,CAAC,IAAI,EAAE,CAAC;YAClC,WAAW,GAAG,sBAAsB,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,SAAS,CAC9F,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAClC,CAAC;QACJ,CAAC;QAED,4DAA4D;QAC5D,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,MAAc;QAC3B,OAAO,oBAAoB;QACzB,iFAAiF;QACjF,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,aAAa,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,EACpG,uBAAuB,CAAC,aAAa,CAAC,IAAI,CAAC,CAC5C,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAc,EAAE,OAAsB;QACrD,OAAO,oBAAoB,CACzB,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,EAC5E,uBAAuB,CAAC,aAAa,CAAC,MAAM,CAAC,CAC9C,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAc,EAAE,OAAuB;QACvD,qDAAqD;QACrD,MAAM,oBAAoB,CACxB,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,aAAa,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,EAC7E,uBAAuB,CAAC,aAAa,CAAC,OAAO,CAAC,CAC/C,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAc;QAC/B,OAAO,oBAAoB,CACzB,IAAI,CAAC,kBAAkB,CACrB,MAAM,EACN,aAAa,CAAC,QAAQ;QACtB,6DAA6D;QAC7D,IAAI,CAAC,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,EACxF,IAAI,CACL,EACD,uBAAuB,CAAC,aAAa,CAAC,QAAQ,CAAC,CAChD,CAAC;IACJ,CAAC;IAEO,kBAAkB,CACxB,MAAc,EACd,MAAqB,EACrB,QAAkB,EAClB,OAAY;QAEZ,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAa,CAAC,CAAC;QACvE,MAAM,WAAW,GAAG,sBAAsB,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;QACtE,MAAM,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,OAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC;QAC7F,OAAO,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IAChF,CAAC;IAED;;;OAGG;IACK,kBAAkB,CAAC,IAAc;QACvC,MAAM,eAAe,GAA2C;YAC9D,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC3D,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/D,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjE,yDAAyD;YACzD,wHAAwH;YACxH,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACrE,CAAC,SAAS,CAAC,qBAAqB,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC;YACxG,CAAC,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC;SACvG,CAAC;QAEF,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;YACnC,4EAA4E;YAC5E,eAAe,CAAC,IAAI,CAClB,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EACnE,CAAC,SAAS,CAAC,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC,EACtG,CAAC,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC,CACrG,CAAC;QACJ,CAAC;QAED,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC;YACtE,qFAAqF;YACrF,eAAe,CAAC,IAAI,CAClB,CAAC,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC,EACxG;gBACE,SAAS,CAAC,yBAAyB,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC;gBACtD,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,yBAAyB,CAAC;aACzD,EACD;gBACE,SAAS,CAAC,2BAA2B,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC;gBACxD,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,2BAA2B,CAAC;aAC3D,EACD;gBACE,SAAS,CAAC,yBAAyB,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC;gBACtD,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,yBAAyB,CAAC;aACzD,CACF,CAAC;QACJ,CAAC;QAED,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YACnC,eAAe,CAAC,IAAI,CAClB,CAAC,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC,EACpG,CAAC,SAAS,CAAC,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC,CACvG,CAAC;QACJ,CAAC;QAED,OAAO,eAAe,CAAC;IACzB,CAAC;IAES,qBAAqB,CAAC,OAA8B,EAAE,IAAY;QAC1E,iDAAiD;QACjD,oFAAoF;QACpF,sFAAsF;QACtF,mBAAmB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,EAAC,OAAO,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC;IACrG,CAAC;IAES,iBAAiB,CAAC,MAAc,EAAE,QAA4B;QACtE,8BAA8B;QAC9B,IAAI,QAAQ,CAAC,MAAM,KAAK,aAAa,CAAC,MAAM,EAAE,CAAC;YAC7C,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC7E,CAAC;IACH,CAAC;IAES,sBAAsB,CAAC,MAAc,EAAE,MAAqB,EAAE,KAAmB;QACzF,MAAM,UAAU,GAAG,sBAAsB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACzD,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;YACxB,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtE,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAmB,EAAE,MAAc;QACzD,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,CAAC,qBAAqB,CAAC,EAAC,MAAM,EAAE,aAAa,CAAC,MAAM,EAAE,IAAI,EAAC,EAAE,MAAM,CAAC,CAAC;QAEzE,MAAM;YACJ,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;YACzD,gCAAgC;YAChC,IAAI,EAAE,QAAQ,CAAC,MAAM;SACtB,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,CAAC,SAAS,CAAC,GAAmB,EAAE,MAAc;QAC1D,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,CAAC,qBAAqB,CAAC,EAAC,MAAM,EAAE,aAAa,CAAC,OAAO,EAAE,IAAI,EAAC,EAAE,MAAM,CAAC,CAAC;QAE1E,MAAM;YACJ,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAC7C,iCAAiC;YACjC,IAAI,EAAE,QAAQ,CAAC,MAAM;SACtB,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,CAAC,MAAM,CAAC,GAAmB,EAAE,MAAc;QACvD,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACnD,IAAI,CAAC,qBAAqB,CAAC,EAAC,MAAM,EAAE,aAAa,CAAC,IAAI,EAAE,IAAI,EAAC,EAAE,MAAM,CAAC,CAAC;QACvE,MAAM;YACJ,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC;YAClE,8BAA8B;YAC9B,IAAI,EAAE,QAAQ,CAAC,MAAM;SACtB,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,CAAC,UAAU,CAAC,GAAmB,EAAE,MAAc;QAC3D,IAAI,CAAC,qBAAqB,CAAC,EAAC,MAAM,EAAE,aAAa,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAC,EAAE,MAAM,CAAC,CAAC;QAEjF,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC;QAC9C,kCAAkC;QAClC,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC7B,MAAM,IAAI,GAAG,uBAAuB,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QAEhF,MAAM;YACJ,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;YAC9B,IAAI;SACL,CAAC;IACJ,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"ReqRespBeaconNode.js","sourceRoot":"","sources":["../../../src/network/reqresp/ReqRespBeaconNode.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,17 @@
|
|
|
1
1
|
import { ChainForkConfig } from "@lodestar/config";
|
|
2
|
-
import { Epoch, SignedBeaconBlock, Slot,
|
|
3
|
-
import {
|
|
2
|
+
import { ColumnIndex, Epoch, SignedBeaconBlock, Slot, deneb, fulu, phase0 } from "@lodestar/types";
|
|
3
|
+
import { Logger } from "@lodestar/utils";
|
|
4
|
+
import { BlobsSource, BlockInput, BlockSource, DataColumnsSource } from "../../chain/blocks/types.js";
|
|
4
5
|
import { PeerIdStr } from "../../util/peerId.js";
|
|
5
|
-
import { INetwork } from "../interface.js";
|
|
6
|
-
export
|
|
7
|
-
|
|
6
|
+
import { INetwork, WithOptionalBytes } from "../interface.js";
|
|
7
|
+
export type PartialDownload = null | {
|
|
8
|
+
blocks: BlockInput[];
|
|
9
|
+
pendingDataColumns: number[];
|
|
10
|
+
};
|
|
11
|
+
export declare function beaconBlocksMaybeBlobsByRange(config: ChainForkConfig, network: INetwork, peerId: PeerIdStr, request: phase0.BeaconBlocksByRangeRequest, currentEpoch: Epoch, partialDownload: PartialDownload, peerClient: string, logger?: Logger): Promise<{
|
|
12
|
+
blocks: BlockInput[];
|
|
13
|
+
pendingDataColumns: null | number[];
|
|
14
|
+
}>;
|
|
15
|
+
export declare function matchBlockWithBlobs(config: ChainForkConfig, allBlocks: WithOptionalBytes<SignedBeaconBlock>[], allBlobSidecars: deneb.BlobSidecar[], endSlot: Slot, blockSource: BlockSource, blobsSource: BlobsSource): BlockInput[];
|
|
16
|
+
export declare function matchBlockWithDataColumns(_network: INetwork, peerId: PeerIdStr, config: ChainForkConfig, sampledColumns: ColumnIndex[], requestedColumns: number[], allBlocks: WithOptionalBytes<SignedBeaconBlock>[], allDataColumnSidecars: fulu.DataColumnSidecar[], endSlot: Slot, blockSource: BlockSource, dataColumnsSource: DataColumnsSource, prevPartialDownload: null | PartialDownload, peerClient: string, logger?: Logger): BlockInput[];
|
|
8
17
|
//# sourceMappingURL=beaconBlocksMaybeBlobsByRange.d.ts.map
|
|
@@ -1,12 +1,14 @@
|
|
|
1
|
-
import { ForkSeq } from "@lodestar/params";
|
|
1
|
+
import { ForkName, ForkSeq } from "@lodestar/params";
|
|
2
2
|
import { computeEpochAtSlot } from "@lodestar/state-transition";
|
|
3
|
-
import {
|
|
4
|
-
|
|
3
|
+
import { ssz } from "@lodestar/types";
|
|
4
|
+
import { BlobsSource, BlockInputType, BlockSource, DataColumnsSource, getBlockInput, getBlockInputDataColumns, } from "../../chain/blocks/types.js";
|
|
5
|
+
import { getEmptyBlockInputCacheEntry } from "../../chain/seenCache/seenGossipBlockInput.js";
|
|
6
|
+
export async function beaconBlocksMaybeBlobsByRange(config, network, peerId, request, currentEpoch, partialDownload, peerClient, logger) {
|
|
5
7
|
// Code below assumes the request is in the same epoch
|
|
6
8
|
// Range sync satisfies this condition, but double check here for sanity
|
|
7
9
|
const { startSlot, count } = request;
|
|
8
10
|
if (count < 1) {
|
|
9
|
-
return [];
|
|
11
|
+
return { blocks: [], pendingDataColumns: null };
|
|
10
12
|
}
|
|
11
13
|
const endSlot = startSlot + count - 1;
|
|
12
14
|
const startEpoch = computeEpochAtSlot(startSlot);
|
|
@@ -14,23 +16,83 @@ export async function beaconBlocksMaybeBlobsByRange(config, network, peerId, req
|
|
|
14
16
|
if (startEpoch !== endEpoch) {
|
|
15
17
|
throw Error(`BeaconBlocksByRangeRequest must be in the same epoch startEpoch=${startEpoch} != endEpoch=${endEpoch}`);
|
|
16
18
|
}
|
|
19
|
+
const forkSeq = config.getForkSeq(startSlot);
|
|
17
20
|
// Note: Assumes all blocks in the same epoch
|
|
18
|
-
if (
|
|
19
|
-
const
|
|
20
|
-
|
|
21
|
+
if (forkSeq < ForkSeq.deneb) {
|
|
22
|
+
const beaconBlocks = await network.sendBeaconBlocksByRange(peerId, request);
|
|
23
|
+
const blocks = beaconBlocks.map((block) => getBlockInput.preData(config, block.data, BlockSource.byRange));
|
|
24
|
+
return { blocks, pendingDataColumns: null };
|
|
21
25
|
}
|
|
22
26
|
// From Deneb
|
|
23
27
|
// Only request blobs if they are recent enough
|
|
24
28
|
if (startEpoch >= currentEpoch - config.MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS) {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
29
|
+
if (forkSeq < ForkSeq.fulu) {
|
|
30
|
+
const [allBlocks, allBlobSidecars] = await Promise.all([
|
|
31
|
+
network.sendBeaconBlocksByRange(peerId, request),
|
|
32
|
+
network.sendBlobSidecarsByRange(peerId, request),
|
|
33
|
+
]);
|
|
34
|
+
const blocks = matchBlockWithBlobs(config, allBlocks, allBlobSidecars, endSlot, BlockSource.byRange, BlobsSource.byRange);
|
|
35
|
+
return { blocks, pendingDataColumns: null };
|
|
36
|
+
}
|
|
37
|
+
// get columns
|
|
38
|
+
const sampledColumns = network.custodyConfig.sampledColumns;
|
|
39
|
+
const neededColumns = partialDownload ? partialDownload.pendingDataColumns : sampledColumns;
|
|
40
|
+
const peerColumns = network.getConnectedPeerCustody(peerId);
|
|
41
|
+
// get match
|
|
42
|
+
const columns = peerColumns.reduce((acc, elem) => {
|
|
43
|
+
if (neededColumns.includes(elem)) {
|
|
44
|
+
acc.push(elem);
|
|
45
|
+
}
|
|
46
|
+
return acc;
|
|
47
|
+
}, []);
|
|
48
|
+
if (columns.length === 0 && partialDownload !== null) {
|
|
49
|
+
// this peer has nothing to offer and should not have been selected for batch download
|
|
50
|
+
// throw error?
|
|
51
|
+
return partialDownload;
|
|
52
|
+
}
|
|
53
|
+
const pendingDataColumns = neededColumns.reduce((acc, elem) => {
|
|
54
|
+
if (!columns.includes(elem)) {
|
|
55
|
+
acc.push(elem);
|
|
56
|
+
}
|
|
57
|
+
return acc;
|
|
58
|
+
}, []);
|
|
59
|
+
const dataColumnRequest = { ...request, columns };
|
|
60
|
+
const [allBlocks, allDataColumnSidecars] = await Promise.all([
|
|
61
|
+
// TODO-das: investigate why partialDownload blocks is empty here
|
|
62
|
+
partialDownload && partialDownload.blocks.length > 0
|
|
63
|
+
? partialDownload.blocks.map((blockInput) => ({ data: blockInput.block }))
|
|
64
|
+
: network.sendBeaconBlocksByRange(peerId, request),
|
|
65
|
+
columns.length === 0 ? [] : network.sendDataColumnSidecarsByRange(peerId, dataColumnRequest),
|
|
28
66
|
]);
|
|
29
|
-
|
|
67
|
+
logger?.debug("ByRange requests", {
|
|
68
|
+
beaconBlocksRequest: JSON.stringify(ssz.phase0.BeaconBlocksByRangeRequest.toJson(request)),
|
|
69
|
+
dataColumnRequest: JSON.stringify(ssz.fulu.DataColumnSidecarsByRangeRequest.toJson(dataColumnRequest)),
|
|
70
|
+
[`allBlocks(${allBlocks.length})`]: allBlocks.map((blk) => blk.data.message.slot).join(" "),
|
|
71
|
+
[`allDataColumnSidecars(${allDataColumnSidecars.length})`]: allDataColumnSidecars
|
|
72
|
+
.map((dCol) => `${dCol.signedBlockHeader.message.slot}:${dCol.index}`)
|
|
73
|
+
.join(" "),
|
|
74
|
+
peerColumns: peerColumns.join(" "),
|
|
75
|
+
peerId,
|
|
76
|
+
peerClient,
|
|
77
|
+
prevPartialDownload: !!partialDownload,
|
|
78
|
+
});
|
|
79
|
+
const blocks = matchBlockWithDataColumns(network, peerId, config, sampledColumns, columns, allBlocks, allDataColumnSidecars, endSlot, BlockSource.byRange, DataColumnsSource.byRange, partialDownload, peerClient, logger);
|
|
80
|
+
return { blocks, pendingDataColumns: pendingDataColumns.length > 0 ? pendingDataColumns : null };
|
|
30
81
|
}
|
|
82
|
+
logger?.verbose(`Download range is out of ${config.MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS} epochs, skip Blobs and DataColumnSidecars download`, {
|
|
83
|
+
startEpoch,
|
|
84
|
+
startSlot,
|
|
85
|
+
endSlot,
|
|
86
|
+
currentEpoch,
|
|
87
|
+
});
|
|
31
88
|
// Data is out of range, only request blocks
|
|
32
89
|
const blocks = await network.sendBeaconBlocksByRange(peerId, request);
|
|
33
|
-
return
|
|
90
|
+
return {
|
|
91
|
+
blocks: blocks.map((block) => getBlockInput.outOfRangeData(config, block.data, BlockSource.byRange)),
|
|
92
|
+
// TODO: (@matthewkeil) this was a merge conflict when rebased on electra. Should this be a null or an empty array? Should it
|
|
93
|
+
// depend on which fork we are in? Need to revisit
|
|
94
|
+
pendingDataColumns: null,
|
|
95
|
+
};
|
|
34
96
|
}
|
|
35
97
|
// Assumes that the blobs are in the same sequence as blocks, doesn't require block to be sorted
|
|
36
98
|
export function matchBlockWithBlobs(config, allBlocks, allBlobSidecars, endSlot, blockSource, blobsSource) {
|
|
@@ -68,7 +130,6 @@ export function matchBlockWithBlobs(config, allBlocks, allBlobSidecars, endSlot,
|
|
|
68
130
|
blobs: blobSidecars,
|
|
69
131
|
blobsSource,
|
|
70
132
|
};
|
|
71
|
-
// TODO DENEB: instead of null, pass payload in bytes
|
|
72
133
|
blockInputs.push(getBlockInput.availableData(config, block.data, blockSource, blockData));
|
|
73
134
|
}
|
|
74
135
|
}
|
|
@@ -80,8 +141,132 @@ export function matchBlockWithBlobs(config, allBlocks, allBlobSidecars, endSlot,
|
|
|
80
141
|
throw Error(`Unmatched blobSidecars, blocks=${allBlocks.length}, blobs=${allBlobSidecars.length} lastMatchedSlot=${lastMatchedSlot}, pending blobSidecars slots=${allBlobSidecars
|
|
81
142
|
.slice(blobSideCarIndex)
|
|
82
143
|
.map((blb) => blb.signedBlockHeader.message.slot)
|
|
83
|
-
.join("
|
|
144
|
+
.join(" ")}`);
|
|
145
|
+
}
|
|
146
|
+
return blockInputs;
|
|
147
|
+
}
|
|
148
|
+
export function matchBlockWithDataColumns(_network, peerId, config, sampledColumns, requestedColumns, allBlocks, allDataColumnSidecars, endSlot, blockSource, dataColumnsSource, prevPartialDownload, peerClient, logger) {
|
|
149
|
+
const blockInputs = [];
|
|
150
|
+
let dataColumnSideCarIndex = 0;
|
|
151
|
+
let lastMatchedSlot = -1;
|
|
152
|
+
const neededColumns = prevPartialDownload?.pendingDataColumns ?? sampledColumns;
|
|
153
|
+
const shouldHaveAllData = neededColumns.reduce((acc, elem) => acc && requestedColumns.includes(elem), true);
|
|
154
|
+
// Match dataColumnSideCar with the block as some blocks would have no dataColumns and hence
|
|
155
|
+
// would be omitted from the response. If there are any inconsitencies in the
|
|
156
|
+
// response, the validations during import will reject the block and hence this
|
|
157
|
+
// entire segment.
|
|
158
|
+
//
|
|
159
|
+
// Assuming that the blocks and blobs will come in same sorted order
|
|
160
|
+
for (let i = 0; i < allBlocks.length; i++) {
|
|
161
|
+
const block = allBlocks[i];
|
|
162
|
+
const forkSeq = config.getForkSeq(block.data.message.slot);
|
|
163
|
+
if (forkSeq < ForkSeq.fulu) {
|
|
164
|
+
throw Error(`Invalid block forkSeq=${forkSeq} < ForSeq.fulu for matchBlockWithDataColumns`);
|
|
165
|
+
}
|
|
166
|
+
const dataColumnSidecars = [];
|
|
167
|
+
while (allDataColumnSidecars[dataColumnSideCarIndex]?.signedBlockHeader.message.slot === block.data.message.slot) {
|
|
168
|
+
dataColumnSidecars.push(allDataColumnSidecars[dataColumnSideCarIndex]);
|
|
169
|
+
lastMatchedSlot = block.data.message.slot;
|
|
170
|
+
dataColumnSideCarIndex++;
|
|
171
|
+
}
|
|
172
|
+
const blobKzgCommitmentsLen = block.data.message.body.blobKzgCommitments.length;
|
|
173
|
+
logger?.debug("processing matchBlockWithDataColumns", {
|
|
174
|
+
blobKzgCommitmentsLen,
|
|
175
|
+
dataColumnSidecars: dataColumnSidecars.length,
|
|
176
|
+
shouldHaveAllData,
|
|
177
|
+
neededColumns: neededColumns.join(" "),
|
|
178
|
+
requestedColumns: requestedColumns.join(" "),
|
|
179
|
+
slot: block.data.message.slot,
|
|
180
|
+
dataColumnsSlots: dataColumnSidecars.map((dcm) => dcm.signedBlockHeader.message.slot).join(" "),
|
|
181
|
+
peerClient,
|
|
182
|
+
});
|
|
183
|
+
if (blobKzgCommitmentsLen === 0) {
|
|
184
|
+
if (dataColumnSidecars.length > 0) {
|
|
185
|
+
throw Error(`Missing or mismatching dataColumnSidecars from peerId=${peerId} for blockSlot=${block.data.message.slot} with blobKzgCommitmentsLen=0 dataColumnSidecars=${dataColumnSidecars.length}>0`);
|
|
186
|
+
}
|
|
187
|
+
const blockData = {
|
|
188
|
+
fork: config.getForkName(block.data.message.slot),
|
|
189
|
+
dataColumns: [],
|
|
190
|
+
dataColumnsBytes: [],
|
|
191
|
+
dataColumnsSource,
|
|
192
|
+
};
|
|
193
|
+
blockInputs.push(getBlockInput.availableData(config, block.data, blockSource, blockData));
|
|
194
|
+
}
|
|
195
|
+
else {
|
|
196
|
+
// Quick inspect how many blobSidecars was expected
|
|
197
|
+
const dataColumnIndexes = dataColumnSidecars.map((dataColumnSidecar) => dataColumnSidecar.index);
|
|
198
|
+
const requestedColumnsPresent = requestedColumns.reduce((acc, columnIndex) => acc && dataColumnIndexes.includes(columnIndex), true);
|
|
199
|
+
logger?.debug("matchBlockWithDataColumns2", {
|
|
200
|
+
dataColumnIndexes: dataColumnIndexes.join(" "),
|
|
201
|
+
requestedColumnsPresent,
|
|
202
|
+
slot: block.data.message.slot,
|
|
203
|
+
peerClient,
|
|
204
|
+
});
|
|
205
|
+
if (dataColumnSidecars.length !== requestedColumns.length || !requestedColumnsPresent) {
|
|
206
|
+
logger?.debug(`Missing or mismatching dataColumnSidecars from peerId=${peerId} for blockSlot=${block.data.message.slot} with numColumns=${sampledColumns.length} dataColumnSidecars=${dataColumnSidecars.length} requestedColumnsPresent=${requestedColumnsPresent} received dataColumnIndexes=${dataColumnIndexes.join(" ")} requested=${requestedColumns.join(" ")}`, {
|
|
207
|
+
allBlocks: allBlocks.length,
|
|
208
|
+
allDataColumnSidecars: allDataColumnSidecars.length,
|
|
209
|
+
peerId,
|
|
210
|
+
blobKzgCommitmentsLen,
|
|
211
|
+
peerClient,
|
|
212
|
+
});
|
|
213
|
+
throw Error(`Missing or mismatching dataColumnSidecars from peerId=${peerId} for blockSlot=${block.data.message.slot} blobKzgCommitmentsLen=${blobKzgCommitmentsLen} with numColumns=${sampledColumns.length} dataColumnSidecars=${dataColumnSidecars.length} requestedColumnsPresent=${requestedColumnsPresent} received dataColumnIndexes=${dataColumnIndexes.join(" ")} requested=${requestedColumns.join(" ")}`);
|
|
214
|
+
}
|
|
215
|
+
let cachedData;
|
|
216
|
+
// TODO-das: investigate why partialDownload blocks is empty here
|
|
217
|
+
if (prevPartialDownload !== null && prevPartialDownload.blocks.length > 0) {
|
|
218
|
+
const prevBlockInput = prevPartialDownload.blocks[i];
|
|
219
|
+
if (prevBlockInput.type !== BlockInputType.dataPromise) {
|
|
220
|
+
throw Error(`prevBlockInput.type=${prevBlockInput.type} in prevPartialDownload`);
|
|
221
|
+
}
|
|
222
|
+
cachedData = prevBlockInput.cachedData;
|
|
223
|
+
}
|
|
224
|
+
else {
|
|
225
|
+
// biome-ignore lint/style/noNonNullAssertion: checked below for validity
|
|
226
|
+
cachedData = getEmptyBlockInputCacheEntry(config.getForkName(block.data.message.slot), -1).cachedData;
|
|
227
|
+
if (cachedData === undefined) {
|
|
228
|
+
throw Error("Invalid cachedData=undefined from getEmptyBlockInputCacheEntry");
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
if (cachedData.fork !== ForkName.fulu) {
|
|
232
|
+
throw Error("Invalid fork for cachedData on dataColumns");
|
|
233
|
+
}
|
|
234
|
+
for (const dataColumnSidecar of dataColumnSidecars) {
|
|
235
|
+
cachedData.dataColumnsCache.set(dataColumnSidecar.index, {
|
|
236
|
+
dataColumn: dataColumnSidecar,
|
|
237
|
+
dataColumnBytes: null,
|
|
238
|
+
});
|
|
239
|
+
}
|
|
240
|
+
if (shouldHaveAllData) {
|
|
241
|
+
const { dataColumns, dataColumnsBytes } = getBlockInputDataColumns(cachedData.dataColumnsCache, sampledColumns);
|
|
242
|
+
const blockData = {
|
|
243
|
+
fork: config.getForkName(block.data.message.slot),
|
|
244
|
+
dataColumns,
|
|
245
|
+
dataColumnsBytes,
|
|
246
|
+
dataColumnsSource,
|
|
247
|
+
};
|
|
248
|
+
// TODO DENEB: instead of null, pass payload in bytes
|
|
249
|
+
blockInputs.push(getBlockInput.availableData(config, block.data, blockSource, blockData));
|
|
250
|
+
}
|
|
251
|
+
else {
|
|
252
|
+
blockInputs.push(getBlockInput.dataPromise(config, block.data, blockSource, cachedData));
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
}
|
|
256
|
+
// If there are still unconsumed blobs this means that the response was inconsistent
|
|
257
|
+
// and matching was wrong and hence we should throw error
|
|
258
|
+
if (allDataColumnSidecars[dataColumnSideCarIndex] !== undefined &&
|
|
259
|
+
// If there are no data columns, the data columns request can give 1 block outside the requested range
|
|
260
|
+
allDataColumnSidecars[dataColumnSideCarIndex].signedBlockHeader.message.slot <= endSlot) {
|
|
261
|
+
throw Error(`Unmatched blobSidecars, blocks=${allBlocks.length}, blobs=${allDataColumnSidecars.length} lastMatchedSlot=${lastMatchedSlot}, pending blobSidecars slots=${allDataColumnSidecars
|
|
262
|
+
.slice(dataColumnSideCarIndex)
|
|
263
|
+
.map((blb) => blb.signedBlockHeader.message.slot)
|
|
264
|
+
.join(" ")}`);
|
|
84
265
|
}
|
|
266
|
+
logger?.debug("matched BlockWithDataColumns", {
|
|
267
|
+
peerClient,
|
|
268
|
+
blockInputs: blockInputs.map((bInpt) => `${bInpt.block.message.slot}=${bInpt.type}`).join(" "),
|
|
269
|
+
});
|
|
85
270
|
return blockInputs;
|
|
86
271
|
}
|
|
87
272
|
//# sourceMappingURL=beaconBlocksMaybeBlobsByRange.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"beaconBlocksMaybeBlobsByRange.js","sourceRoot":"","sources":["../../../src/network/reqresp/beaconBlocksMaybeBlobsByRange.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"beaconBlocksMaybeBlobsByRange.js","sourceRoot":"","sources":["../../../src/network/reqresp/beaconBlocksMaybeBlobsByRange.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,43 @@
|
|
|
1
1
|
import { ChainForkConfig } from "@lodestar/config";
|
|
2
|
-
import { RootHex, phase0 } from "@lodestar/types";
|
|
2
|
+
import { RootHex, SignedBeaconBlock, phase0 } from "@lodestar/types";
|
|
3
3
|
import { BlobAndProof } from "@lodestar/types/deneb";
|
|
4
|
-
import {
|
|
4
|
+
import { Logger } from "@lodestar/utils";
|
|
5
|
+
import { BlockInput, CachedBlobs, NullBlockInput } from "../../chain/blocks/types.js";
|
|
6
|
+
import { ChainEventEmitter } from "../../chain/emitter.js";
|
|
5
7
|
import { IExecutionEngine } from "../../execution/index.js";
|
|
6
8
|
import { Metrics } from "../../metrics/index.js";
|
|
7
9
|
import { PeerIdStr } from "../../util/peerId.js";
|
|
8
10
|
import { INetwork } from "../interface.js";
|
|
9
|
-
|
|
10
|
-
export declare function
|
|
11
|
-
|
|
11
|
+
import { PartialDownload } from "./beaconBlocksMaybeBlobsByRange.js";
|
|
12
|
+
export declare function beaconBlocksMaybeBlobsByRoot(config: ChainForkConfig, network: INetwork, peerId: PeerIdStr, request: phase0.BeaconBlocksByRootRequest, partialDownload: null | PartialDownload, peerClient: string, logger?: Logger): Promise<{
|
|
13
|
+
blocks: BlockInput[];
|
|
14
|
+
pendingDataColumns: null | number[];
|
|
15
|
+
}>;
|
|
16
|
+
export declare function unavailableBeaconBlobsByRoot(config: ChainForkConfig, network: INetwork, peerId: PeerIdStr, peerClient: string, unavailableBlockInput: BlockInput | NullBlockInput, opts: {
|
|
17
|
+
logger?: Logger;
|
|
18
|
+
metrics?: Metrics | null;
|
|
12
19
|
executionEngine: IExecutionEngine;
|
|
20
|
+
emitter: ChainEventEmitter;
|
|
13
21
|
engineGetBlobsCache?: Map<RootHex, BlobAndProof | null>;
|
|
14
22
|
blockInputsRetryTrackerCache?: Set<RootHex>;
|
|
15
23
|
}): Promise<BlockInput>;
|
|
24
|
+
export declare function unavailableBeaconBlobsByRootPreFulu(config: ChainForkConfig, network: INetwork, peerId: PeerIdStr, unavailableBlockInput: BlockInput | NullBlockInput, block: SignedBeaconBlock, cachedData: CachedBlobs, opts: {
|
|
25
|
+
metrics?: Metrics | null;
|
|
26
|
+
executionEngine: IExecutionEngine;
|
|
27
|
+
engineGetBlobsCache?: Map<RootHex, BlobAndProof | null>;
|
|
28
|
+
blockInputsRetryTrackerCache?: Set<RootHex>;
|
|
29
|
+
}): Promise<BlockInput>;
|
|
30
|
+
/**
|
|
31
|
+
* Download more columns for a BlockInput
|
|
32
|
+
* - unavailableBlockInput should have block, but not enough blobs (deneb) or data columns (fulu)
|
|
33
|
+
*
|
|
34
|
+
* This function may return data promise, and consumer should continue with fetching more blobs or columns from other peers
|
|
35
|
+
* see UnknownBlockSync.fetchUnavailableBlockInput()
|
|
36
|
+
*/
|
|
37
|
+
export declare function unavailableBeaconBlobsByRootPostFulu(config: ChainForkConfig, network: INetwork, peerId: PeerIdStr, peerClient: string, unavailableBlockInput: BlockInput, block: SignedBeaconBlock, cachedData: NullBlockInput["cachedData"], opts: {
|
|
38
|
+
metrics?: Metrics | null;
|
|
39
|
+
executionEngine: IExecutionEngine;
|
|
40
|
+
emitter: ChainEventEmitter;
|
|
41
|
+
logger?: Logger;
|
|
42
|
+
}): Promise<BlockInput>;
|
|
16
43
|
//# sourceMappingURL=beaconBlocksMaybeBlobsByRoot.d.ts.map
|