@lodestar/beacon-node 1.41.0-dev.afd446235e → 1.41.0-dev.bb273175f2
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.d.ts.map +1 -1
- package/lib/api/impl/beacon/blocks/index.js +3 -2
- package/lib/api/impl/beacon/blocks/index.js.map +1 -1
- package/lib/api/impl/debug/index.d.ts.map +1 -1
- package/lib/api/impl/debug/index.js +1 -0
- package/lib/api/impl/debug/index.js.map +1 -1
- package/lib/api/impl/validator/index.d.ts.map +1 -1
- package/lib/api/impl/validator/index.js +26 -10
- package/lib/api/impl/validator/index.js.map +1 -1
- package/lib/chain/archiveStore/archiveStore.d.ts.map +1 -1
- package/lib/chain/archiveStore/archiveStore.js.map +1 -1
- package/lib/chain/archiveStore/utils/archiveBlocks.d.ts +3 -8
- package/lib/chain/archiveStore/utils/archiveBlocks.d.ts.map +1 -1
- package/lib/chain/archiveStore/utils/archiveBlocks.js +1 -1
- package/lib/chain/archiveStore/utils/archiveBlocks.js.map +1 -1
- package/lib/chain/archiveStore/utils/updateBackfillRange.js +1 -1
- package/lib/chain/archiveStore/utils/updateBackfillRange.js.map +1 -1
- package/lib/chain/blocks/blockInput/blockInput.d.ts +20 -2
- package/lib/chain/blocks/blockInput/blockInput.d.ts.map +1 -1
- package/lib/chain/blocks/blockInput/blockInput.js +47 -0
- package/lib/chain/blocks/blockInput/blockInput.js.map +1 -1
- package/lib/chain/blocks/blockInput/types.d.ts +13 -1
- package/lib/chain/blocks/blockInput/types.d.ts.map +1 -1
- package/lib/chain/blocks/blockInput/types.js +1 -0
- package/lib/chain/blocks/blockInput/types.js.map +1 -1
- package/lib/chain/blocks/importBlock.d.ts.map +1 -1
- package/lib/chain/blocks/importBlock.js +27 -4
- package/lib/chain/blocks/importBlock.js.map +1 -1
- package/lib/chain/blocks/verifyBlocksDataAvailability.d.ts.map +1 -1
- package/lib/chain/blocks/verifyBlocksDataAvailability.js +3 -0
- package/lib/chain/blocks/verifyBlocksDataAvailability.js.map +1 -1
- package/lib/chain/blocks/verifyBlocksExecutionPayloads.d.ts +4 -0
- package/lib/chain/blocks/verifyBlocksExecutionPayloads.d.ts.map +1 -1
- package/lib/chain/blocks/verifyBlocksExecutionPayloads.js +5 -1
- package/lib/chain/blocks/verifyBlocksExecutionPayloads.js.map +1 -1
- package/lib/chain/blocks/verifyBlocksSanityChecks.d.ts.map +1 -1
- package/lib/chain/blocks/verifyBlocksSanityChecks.js +4 -1
- package/lib/chain/blocks/verifyBlocksSanityChecks.js.map +1 -1
- package/lib/chain/blocks/writeBlockInputToDb.d.ts +12 -3
- package/lib/chain/blocks/writeBlockInputToDb.d.ts.map +1 -1
- package/lib/chain/blocks/writeBlockInputToDb.js +101 -96
- package/lib/chain/blocks/writeBlockInputToDb.js.map +1 -1
- package/lib/chain/chain.d.ts +1 -1
- package/lib/chain/chain.d.ts.map +1 -1
- package/lib/chain/chain.js +11 -11
- package/lib/chain/chain.js.map +1 -1
- package/lib/chain/emitter.d.ts +3 -3
- package/lib/chain/emitter.d.ts.map +1 -1
- package/lib/chain/errors/executionPayloadEnvelope.d.ts +2 -2
- package/lib/chain/errors/executionPayloadEnvelope.d.ts.map +1 -1
- package/lib/chain/errors/executionPayloadEnvelope.js.map +1 -1
- package/lib/chain/forkChoice/index.d.ts.map +1 -1
- package/lib/chain/forkChoice/index.js +30 -24
- package/lib/chain/forkChoice/index.js.map +1 -1
- package/lib/chain/opPools/aggregatedAttestationPool.js +1 -1
- package/lib/chain/opPools/aggregatedAttestationPool.js.map +1 -1
- package/lib/chain/produceBlock/produceBlockBody.d.ts.map +1 -1
- package/lib/chain/produceBlock/produceBlockBody.js +1 -2
- package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
- package/lib/chain/regen/queued.d.ts.map +1 -1
- package/lib/chain/regen/queued.js +4 -1
- package/lib/chain/regen/queued.js.map +1 -1
- package/lib/chain/regen/regen.d.ts.map +1 -1
- package/lib/chain/regen/regen.js +6 -2
- package/lib/chain/regen/regen.js.map +1 -1
- package/lib/chain/seenCache/seenGossipBlockInput.d.ts.map +1 -1
- package/lib/chain/seenCache/seenGossipBlockInput.js +15 -7
- package/lib/chain/seenCache/seenGossipBlockInput.js.map +1 -1
- package/lib/chain/validation/aggregateAndProof.js +1 -1
- package/lib/chain/validation/aggregateAndProof.js.map +1 -1
- package/lib/chain/validation/attestation.js +3 -3
- package/lib/chain/validation/attestation.js.map +1 -1
- package/lib/chain/validation/attesterSlashing.d.ts.map +1 -1
- package/lib/chain/validation/attesterSlashing.js +8 -1
- package/lib/chain/validation/attesterSlashing.js.map +1 -1
- package/lib/chain/validation/blobSidecar.js +2 -2
- package/lib/chain/validation/blobSidecar.js.map +1 -1
- package/lib/chain/validation/block.d.ts.map +1 -1
- package/lib/chain/validation/block.js +6 -3
- package/lib/chain/validation/block.js.map +1 -1
- package/lib/chain/validation/dataColumnSidecar.js +1 -1
- package/lib/chain/validation/dataColumnSidecar.js.map +1 -1
- package/lib/chain/validation/executionPayloadBid.js +1 -2
- package/lib/chain/validation/executionPayloadBid.js.map +1 -1
- package/lib/chain/validation/executionPayloadEnvelope.js +4 -4
- package/lib/chain/validation/executionPayloadEnvelope.js.map +1 -1
- package/lib/chain/validation/payloadAttestationMessage.js +1 -2
- package/lib/chain/validation/payloadAttestationMessage.js.map +1 -1
- package/lib/constants/network.d.ts +1 -2
- package/lib/constants/network.d.ts.map +1 -1
- package/lib/constants/network.js +0 -1
- package/lib/constants/network.js.map +1 -1
- package/lib/network/peers/peerManager.d.ts +0 -8
- package/lib/network/peers/peerManager.d.ts.map +1 -1
- package/lib/network/peers/peerManager.js +3 -48
- package/lib/network/peers/peerManager.js.map +1 -1
- package/lib/network/processor/gossipHandlers.d.ts.map +1 -1
- package/lib/network/processor/gossipHandlers.js +4 -1
- package/lib/network/processor/gossipHandlers.js.map +1 -1
- package/lib/network/reqresp/handlers/beaconBlocksByRange.d.ts.map +1 -1
- package/lib/network/reqresp/handlers/beaconBlocksByRange.js +3 -2
- package/lib/network/reqresp/handlers/beaconBlocksByRange.js.map +1 -1
- package/lib/network/reqresp/handlers/blobSidecarsByRange.d.ts.map +1 -1
- package/lib/network/reqresp/handlers/blobSidecarsByRange.js +3 -2
- 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.d.ts.map +1 -1
- package/lib/network/reqresp/handlers/dataColumnSidecarsByRange.js +3 -2
- 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/util/clock.d.ts +6 -0
- package/lib/util/clock.d.ts.map +1 -1
- package/lib/util/clock.js +9 -3
- package/lib/util/clock.js.map +1 -1
- package/package.json +26 -26
- package/src/api/impl/beacon/blocks/index.ts +3 -2
- package/src/api/impl/debug/index.ts +1 -0
- package/src/api/impl/validator/index.ts +26 -12
- package/src/chain/archiveStore/archiveStore.ts +5 -5
- package/src/chain/archiveStore/utils/archiveBlocks.ts +4 -5
- package/src/chain/archiveStore/utils/updateBackfillRange.ts +1 -1
- package/src/chain/blocks/blockInput/blockInput.ts +68 -3
- package/src/chain/blocks/blockInput/types.ts +13 -0
- package/src/chain/blocks/importBlock.ts +35 -4
- package/src/chain/blocks/verifyBlocksDataAvailability.ts +3 -0
- package/src/chain/blocks/verifyBlocksExecutionPayloads.ts +9 -2
- package/src/chain/blocks/verifyBlocksSanityChecks.ts +7 -2
- package/src/chain/blocks/writeBlockInputToDb.ts +119 -101
- package/src/chain/chain.ts +26 -14
- package/src/chain/emitter.ts +3 -3
- package/src/chain/errors/executionPayloadEnvelope.ts +6 -2
- package/src/chain/forkChoice/index.ts +39 -21
- package/src/chain/opPools/aggregatedAttestationPool.ts +1 -1
- package/src/chain/produceBlock/produceBlockBody.ts +1 -2
- package/src/chain/regen/queued.ts +7 -2
- package/src/chain/regen/regen.ts +9 -3
- package/src/chain/seenCache/seenGossipBlockInput.ts +16 -7
- package/src/chain/validation/aggregateAndProof.ts +1 -1
- package/src/chain/validation/attestation.ts +3 -3
- package/src/chain/validation/attesterSlashing.ts +9 -0
- package/src/chain/validation/blobSidecar.ts +2 -2
- package/src/chain/validation/block.ts +9 -4
- package/src/chain/validation/dataColumnSidecar.ts +1 -1
- package/src/chain/validation/executionPayloadBid.ts +1 -2
- package/src/chain/validation/executionPayloadEnvelope.ts +4 -4
- package/src/chain/validation/payloadAttestationMessage.ts +1 -2
- package/src/constants/network.ts +0 -1
- package/src/network/peers/peerManager.ts +4 -61
- package/src/network/processor/gossipHandlers.ts +12 -3
- package/src/network/reqresp/handlers/beaconBlocksByRange.ts +3 -2
- package/src/network/reqresp/handlers/blobSidecarsByRange.ts +3 -2
- package/src/network/reqresp/handlers/blobSidecarsByRoot.ts +1 -1
- package/src/network/reqresp/handlers/dataColumnSidecarsByRange.ts +3 -2
- package/src/network/reqresp/handlers/dataColumnSidecarsByRoot.ts +1 -1
- package/src/util/clock.ts +9 -4
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"bugs": {
|
|
12
12
|
"url": "https://github.com/ChainSafe/lodestar/issues"
|
|
13
13
|
},
|
|
14
|
-
"version": "1.41.0-dev.
|
|
14
|
+
"version": "1.41.0-dev.bb273175f2",
|
|
15
15
|
"type": "module",
|
|
16
16
|
"exports": {
|
|
17
17
|
".": {
|
|
@@ -124,37 +124,37 @@
|
|
|
124
124
|
"@fastify/cors": "^10.0.1",
|
|
125
125
|
"@fastify/swagger": "^9.0.0",
|
|
126
126
|
"@fastify/swagger-ui": "^5.0.1",
|
|
127
|
-
"@libp2p/bootstrap": "^12.0.
|
|
127
|
+
"@libp2p/bootstrap": "^12.0.13",
|
|
128
128
|
"@libp2p/crypto": "^5.1.13",
|
|
129
|
-
"@libp2p/gossipsub": "^15.0.
|
|
130
|
-
"@libp2p/identify": "^4.0.
|
|
129
|
+
"@libp2p/gossipsub": "^15.0.14",
|
|
130
|
+
"@libp2p/identify": "^4.0.12",
|
|
131
131
|
"@libp2p/interface": "^3.1.0",
|
|
132
|
-
"@libp2p/mdns": "^12.0.
|
|
133
|
-
"@libp2p/mplex": "^12.0.
|
|
132
|
+
"@libp2p/mdns": "^12.0.13",
|
|
133
|
+
"@libp2p/mplex": "^12.0.13",
|
|
134
134
|
"@libp2p/peer-id": "^6.0.4",
|
|
135
|
-
"@libp2p/prometheus-metrics": "^5.0.
|
|
136
|
-
"@libp2p/tcp": "^11.0.
|
|
137
|
-
"@lodestar/api": "^1.41.0-dev.
|
|
138
|
-
"@lodestar/config": "^1.41.0-dev.
|
|
139
|
-
"@lodestar/db": "^1.41.0-dev.
|
|
140
|
-
"@lodestar/fork-choice": "^1.41.0-dev.
|
|
141
|
-
"@lodestar/light-client": "^1.41.0-dev.
|
|
142
|
-
"@lodestar/logger": "^1.41.0-dev.
|
|
143
|
-
"@lodestar/params": "^1.41.0-dev.
|
|
144
|
-
"@lodestar/reqresp": "^1.41.0-dev.
|
|
145
|
-
"@lodestar/state-transition": "^1.41.0-dev.
|
|
146
|
-
"@lodestar/types": "^1.41.0-dev.
|
|
147
|
-
"@lodestar/utils": "^1.41.0-dev.
|
|
148
|
-
"@lodestar/validator": "^1.41.0-dev.
|
|
135
|
+
"@libp2p/prometheus-metrics": "^5.0.13",
|
|
136
|
+
"@libp2p/tcp": "^11.0.12",
|
|
137
|
+
"@lodestar/api": "^1.41.0-dev.bb273175f2",
|
|
138
|
+
"@lodestar/config": "^1.41.0-dev.bb273175f2",
|
|
139
|
+
"@lodestar/db": "^1.41.0-dev.bb273175f2",
|
|
140
|
+
"@lodestar/fork-choice": "^1.41.0-dev.bb273175f2",
|
|
141
|
+
"@lodestar/light-client": "^1.41.0-dev.bb273175f2",
|
|
142
|
+
"@lodestar/logger": "^1.41.0-dev.bb273175f2",
|
|
143
|
+
"@lodestar/params": "^1.41.0-dev.bb273175f2",
|
|
144
|
+
"@lodestar/reqresp": "^1.41.0-dev.bb273175f2",
|
|
145
|
+
"@lodestar/state-transition": "^1.41.0-dev.bb273175f2",
|
|
146
|
+
"@lodestar/types": "^1.41.0-dev.bb273175f2",
|
|
147
|
+
"@lodestar/utils": "^1.41.0-dev.bb273175f2",
|
|
148
|
+
"@lodestar/validator": "^1.41.0-dev.bb273175f2",
|
|
149
149
|
"@multiformats/multiaddr": "^13.0.1",
|
|
150
150
|
"datastore-core": "^11.0.2",
|
|
151
151
|
"datastore-fs": "^11.0.2",
|
|
152
152
|
"datastore-level": "^12.0.2",
|
|
153
153
|
"deepmerge": "^4.3.1",
|
|
154
|
-
"fastify": "^5.
|
|
154
|
+
"fastify": "^5.8.1",
|
|
155
155
|
"interface-datastore": "^9.0.2",
|
|
156
156
|
"jwt-simple": "0.5.6",
|
|
157
|
-
"libp2p": "3.1.
|
|
157
|
+
"libp2p": "3.1.5",
|
|
158
158
|
"multiformats": "^13.4.2",
|
|
159
159
|
"prom-client": "^15.1.0",
|
|
160
160
|
"qs": "^6.11.1",
|
|
@@ -165,10 +165,10 @@
|
|
|
165
165
|
},
|
|
166
166
|
"devDependencies": {
|
|
167
167
|
"@chainsafe/swap-or-not-shuffle": "^1.2.1",
|
|
168
|
-
"@libp2p/interface-internal": "^3.0.
|
|
168
|
+
"@libp2p/interface-internal": "^3.0.12",
|
|
169
169
|
"@libp2p/logger": "^6.2.2",
|
|
170
|
-
"@libp2p/utils": "^7.0.
|
|
171
|
-
"@lodestar/spec-test-util": "^1.41.0-dev.
|
|
170
|
+
"@libp2p/utils": "^7.0.12",
|
|
171
|
+
"@lodestar/spec-test-util": "^1.41.0-dev.bb273175f2",
|
|
172
172
|
"@types/js-yaml": "^4.0.5",
|
|
173
173
|
"@types/qs": "^6.9.7",
|
|
174
174
|
"@types/tmp": "^0.2.3",
|
|
@@ -185,5 +185,5 @@
|
|
|
185
185
|
"beacon",
|
|
186
186
|
"blockchain"
|
|
187
187
|
],
|
|
188
|
-
"gitHead": "
|
|
188
|
+
"gitHead": "33bc8284a7ac0a15d6b6dac387bd5567f819ed19"
|
|
189
189
|
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import {routes} from "@lodestar/api";
|
|
2
2
|
import {ApiError, ApplicationMethods} from "@lodestar/api/server";
|
|
3
|
+
import {PayloadStatus} from "@lodestar/fork-choice";
|
|
3
4
|
import {
|
|
4
5
|
BUILDER_INDEX_SELF_BUILD,
|
|
5
6
|
ForkPostBellatrix,
|
|
@@ -205,7 +206,7 @@ export function getBeaconBlockApi({
|
|
|
205
206
|
case routes.beacon.BroadcastValidation.consensus: {
|
|
206
207
|
// check if this beacon node produced the block else run validations
|
|
207
208
|
if (!blockLocallyProduced) {
|
|
208
|
-
const parentBlock = chain.forkChoice.
|
|
209
|
+
const parentBlock = chain.forkChoice.getBlockDefaultStatus(signedBlock.message.parentRoot);
|
|
209
210
|
if (parentBlock === null) {
|
|
210
211
|
chain.emitter.emit(ChainEvent.unknownParent, {
|
|
211
212
|
blockInput: blockForImport,
|
|
@@ -650,7 +651,7 @@ export function getBeaconBlockApi({
|
|
|
650
651
|
}
|
|
651
652
|
|
|
652
653
|
// TODO GLOAS: review checks, do we want to implement `broadcast_validation`?
|
|
653
|
-
const block = chain.forkChoice.getBlockHex(blockRootHex);
|
|
654
|
+
const block = chain.forkChoice.getBlockHex(blockRootHex, PayloadStatus.EMPTY);
|
|
654
655
|
if (block === null) {
|
|
655
656
|
throw new ApiError(404, `Block not found for beacon block root ${blockRootHex}`);
|
|
656
657
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import {routes} from "@lodestar/api";
|
|
2
2
|
import {ApplicationMethods} from "@lodestar/api/server";
|
|
3
|
-
import {ExecutionStatus, ProtoBlock} from "@lodestar/fork-choice";
|
|
3
|
+
import {ExecutionStatus, PayloadStatus, ProtoBlock} from "@lodestar/fork-choice";
|
|
4
4
|
import {
|
|
5
5
|
BUILDER_INDEX_SELF_BUILD,
|
|
6
6
|
ForkName,
|
|
@@ -389,7 +389,7 @@ export function getValidatorApi(
|
|
|
389
389
|
*/
|
|
390
390
|
|
|
391
391
|
function notOnOptimisticBlockRoot(beaconBlockRoot: Root): void {
|
|
392
|
-
const protoBeaconBlock = chain.forkChoice.
|
|
392
|
+
const protoBeaconBlock = chain.forkChoice.getBlockDefaultStatus(beaconBlockRoot);
|
|
393
393
|
if (!protoBeaconBlock) {
|
|
394
394
|
throw new ApiError(404, `Block not in forkChoice, beaconBlockRoot=${toRootHex(beaconBlockRoot)}`);
|
|
395
395
|
}
|
|
@@ -401,7 +401,7 @@ export function getValidatorApi(
|
|
|
401
401
|
}
|
|
402
402
|
|
|
403
403
|
function notOnOutOfRangeData(beaconBlockRoot: Root): void {
|
|
404
|
-
const protoBeaconBlock = chain.forkChoice.
|
|
404
|
+
const protoBeaconBlock = chain.forkChoice.getBlockDefaultStatus(beaconBlockRoot);
|
|
405
405
|
if (!protoBeaconBlock) {
|
|
406
406
|
throw new ApiError(404, `Block not in forkChoice, beaconBlockRoot=${toRootHex(beaconBlockRoot)}`);
|
|
407
407
|
}
|
|
@@ -989,8 +989,30 @@ export function getValidatorApi(
|
|
|
989
989
|
const headBlockRoot = fromHex(headBlockRootHex);
|
|
990
990
|
const fork = config.getForkName(slot);
|
|
991
991
|
|
|
992
|
+
const beaconBlockRoot =
|
|
993
|
+
slot >= headSlot
|
|
994
|
+
? // When attesting to the head slot or later, always use the head of the chain.
|
|
995
|
+
headBlockRoot
|
|
996
|
+
: // Permit attesting to slots *prior* to the current head. This is desirable when
|
|
997
|
+
// the VC and BN are out-of-sync due to time issues or overloading.
|
|
998
|
+
getBlockRootAtSlot(headState, slot);
|
|
999
|
+
|
|
992
1000
|
let index: CommitteeIndex;
|
|
993
|
-
if (
|
|
1001
|
+
if (isForkPostGloas(fork)) {
|
|
1002
|
+
const canonicalBlock = chain.forkChoice.getCanonicalBlockByRoot(beaconBlockRoot);
|
|
1003
|
+
if (!canonicalBlock) {
|
|
1004
|
+
// This should never happen
|
|
1005
|
+
throw Error(`Block not found in fork choice for slot=${slot}, root=${toRootHex(beaconBlockRoot)}`);
|
|
1006
|
+
}
|
|
1007
|
+
// After Gloas, attestation.data.index signals payload status in fork-choice:
|
|
1008
|
+
// - 0 = EMPTY / not present, 1 = FULL / present
|
|
1009
|
+
// - same-slot attestations must always use index = 0
|
|
1010
|
+
if (canonicalBlock.slot !== slot) {
|
|
1011
|
+
index = canonicalBlock.payloadStatus === PayloadStatus.FULL ? 1 : 0;
|
|
1012
|
+
} else {
|
|
1013
|
+
index = 0;
|
|
1014
|
+
}
|
|
1015
|
+
} else if (isForkPostElectra(fork)) {
|
|
994
1016
|
index = 0;
|
|
995
1017
|
} else {
|
|
996
1018
|
if (committeeIndex === undefined) {
|
|
@@ -999,14 +1021,6 @@ export function getValidatorApi(
|
|
|
999
1021
|
index = committeeIndex;
|
|
1000
1022
|
}
|
|
1001
1023
|
|
|
1002
|
-
const beaconBlockRoot =
|
|
1003
|
-
slot >= headSlot
|
|
1004
|
-
? // When attesting to the head slot or later, always use the head of the chain.
|
|
1005
|
-
headBlockRoot
|
|
1006
|
-
: // Permit attesting to slots *prior* to the current head. This is desirable when
|
|
1007
|
-
// the VC and BN are out-of-sync due to time issues or overloading.
|
|
1008
|
-
getBlockRootAtSlot(headState, slot);
|
|
1009
|
-
|
|
1010
1024
|
const targetSlot = computeStartSlotAtEpoch(attEpoch);
|
|
1011
1025
|
const targetRoot =
|
|
1012
1026
|
targetSlot >= headSlot
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {CheckpointWithPayloadStatus} from "@lodestar/fork-choice";
|
|
2
2
|
import {LoggerNode} from "@lodestar/logger/node";
|
|
3
3
|
import {ForkSeq} from "@lodestar/params";
|
|
4
4
|
import {Checkpoint} from "@lodestar/types/phase0";
|
|
@@ -44,7 +44,7 @@ export enum ArchiveStoreTask {
|
|
|
44
44
|
*/
|
|
45
45
|
export class ArchiveStore {
|
|
46
46
|
private archiveMode: ArchiveMode;
|
|
47
|
-
private jobQueue: JobItemQueue<[
|
|
47
|
+
private jobQueue: JobItemQueue<[CheckpointWithPayloadStatus], void>;
|
|
48
48
|
|
|
49
49
|
private archiveDataEpochs?: number;
|
|
50
50
|
private readonly statesArchiverStrategy: StateArchiveStrategy;
|
|
@@ -67,7 +67,7 @@ export class ArchiveStore {
|
|
|
67
67
|
this.archiveMode = opts.archiveMode;
|
|
68
68
|
this.archiveDataEpochs = opts.archiveDataEpochs;
|
|
69
69
|
|
|
70
|
-
this.jobQueue = new JobItemQueue<[
|
|
70
|
+
this.jobQueue = new JobItemQueue<[CheckpointWithPayloadStatus], void>(this.processFinalizedCheckpoint, {
|
|
71
71
|
maxLength: PROCESS_FINALIZED_CHECKPOINT_QUEUE_LENGTH,
|
|
72
72
|
signal,
|
|
73
73
|
});
|
|
@@ -168,7 +168,7 @@ export class ArchiveStore {
|
|
|
168
168
|
//-------------------------------------------------------------------------
|
|
169
169
|
// Event handlers
|
|
170
170
|
//-------------------------------------------------------------------------
|
|
171
|
-
private onFinalizedCheckpoint = (finalized:
|
|
171
|
+
private onFinalizedCheckpoint = (finalized: CheckpointWithPayloadStatus): void => {
|
|
172
172
|
this.jobQueue.push(finalized).catch((e) => {
|
|
173
173
|
if (!isQueueErrorAborted(e)) {
|
|
174
174
|
this.logger.error("Error queuing finalized checkpoint", {epoch: finalized.epoch}, e as Error);
|
|
@@ -189,7 +189,7 @@ export class ArchiveStore {
|
|
|
189
189
|
});
|
|
190
190
|
};
|
|
191
191
|
|
|
192
|
-
private processFinalizedCheckpoint = async (finalized:
|
|
192
|
+
private processFinalizedCheckpoint = async (finalized: CheckpointWithPayloadStatus): Promise<void> => {
|
|
193
193
|
try {
|
|
194
194
|
const finalizedEpoch = finalized.epoch;
|
|
195
195
|
const finalizedFork = this.chain.config.getForkSeqAtEpoch(finalizedEpoch);
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import path from "node:path";
|
|
2
2
|
import {ChainForkConfig} from "@lodestar/config";
|
|
3
3
|
import {KeyValue} from "@lodestar/db";
|
|
4
|
-
import {IForkChoice} from "@lodestar/fork-choice";
|
|
4
|
+
import {CheckpointWithPayloadStatus, IForkChoice} from "@lodestar/fork-choice";
|
|
5
5
|
import {ForkSeq, SLOTS_PER_EPOCH} from "@lodestar/params";
|
|
6
6
|
import {computeEpochAtSlot, computeStartSlotAtEpoch} from "@lodestar/state-transition";
|
|
7
|
-
import {Epoch,
|
|
7
|
+
import {Epoch, Slot} from "@lodestar/types";
|
|
8
8
|
import {Logger, fromAsync, fromHex, prettyPrintIndices, toRootHex} from "@lodestar/utils";
|
|
9
9
|
import {IBeaconDb} from "../../../db/index.js";
|
|
10
10
|
import {BlockArchiveBatchPutBinaryItem} from "../../../db/repositories/index.js";
|
|
@@ -19,7 +19,6 @@ const BLOCK_BATCH_SIZE = 256;
|
|
|
19
19
|
const BLOB_SIDECAR_BATCH_SIZE = 32;
|
|
20
20
|
|
|
21
21
|
type BlockRootSlot = {slot: Slot; root: Uint8Array};
|
|
22
|
-
type CheckpointHex = {epoch: Epoch; rootHex: RootHex};
|
|
23
22
|
|
|
24
23
|
/**
|
|
25
24
|
* Persist orphaned block to disk
|
|
@@ -53,7 +52,7 @@ export async function archiveBlocks(
|
|
|
53
52
|
forkChoice: IForkChoice,
|
|
54
53
|
lightclientServer: LightClientServer | undefined,
|
|
55
54
|
logger: Logger,
|
|
56
|
-
finalizedCheckpoint:
|
|
55
|
+
finalizedCheckpoint: CheckpointWithPayloadStatus,
|
|
57
56
|
currentEpoch: Epoch,
|
|
58
57
|
archiveDataEpochs?: number,
|
|
59
58
|
persistOrphanedBlocks?: boolean,
|
|
@@ -62,7 +61,7 @@ export async function archiveBlocks(
|
|
|
62
61
|
// Use fork choice to determine the blocks to archive and delete
|
|
63
62
|
// getAllAncestorBlocks response includes the finalized block, so it's also moved to the cold db
|
|
64
63
|
const {ancestors: finalizedCanonicalBlocks, nonAncestors: finalizedNonCanonicalBlocks} =
|
|
65
|
-
forkChoice.getAllAncestorAndNonAncestorBlocks(finalizedCheckpoint.rootHex);
|
|
64
|
+
forkChoice.getAllAncestorAndNonAncestorBlocks(finalizedCheckpoint.rootHex, finalizedCheckpoint.payloadStatus);
|
|
66
65
|
|
|
67
66
|
// NOTE: The finalized block will be exactly the first block of `epoch` or previous
|
|
68
67
|
const finalizedPostDeneb = finalizedCheckpoint.epoch >= config.DENEB_FORK_EPOCH;
|
|
@@ -20,7 +20,7 @@ export async function updateBackfillRange(
|
|
|
20
20
|
try {
|
|
21
21
|
// Mark the sequence in backfill db from finalized block's slot till anchor slot as
|
|
22
22
|
// filled.
|
|
23
|
-
const finalizedBlockFC = chain.forkChoice.
|
|
23
|
+
const finalizedBlockFC = chain.forkChoice.getBlockHexDefaultStatus(finalized.rootHex);
|
|
24
24
|
if (finalizedBlockFC && finalizedBlockFC.slot > chain.anchorStateLatestBlockSlot) {
|
|
25
25
|
await db.backfilledRanges.put(finalizedBlockFC.slot, chain.anchorStateLatestBlockSlot);
|
|
26
26
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {ForkName, ForkPostFulu, ForkPreDeneb, ForkPreGloas, NUMBER_OF_COLUMNS} from "@lodestar/params";
|
|
2
|
-
import {BeaconBlockBody, BlobIndex, ColumnIndex, SignedBeaconBlock, Slot, deneb, fulu} from "@lodestar/types";
|
|
1
|
+
import {ForkName, ForkPostFulu, ForkPostGloas, ForkPreDeneb, ForkPreGloas, NUMBER_OF_COLUMNS} from "@lodestar/params";
|
|
2
|
+
import {BeaconBlockBody, BlobIndex, ColumnIndex, SignedBeaconBlock, Slot, deneb, fulu, gloas} from "@lodestar/types";
|
|
3
3
|
import {byteArrayEquals, fromHex, prettyBytes, toRootHex, withTimeout} from "@lodestar/utils";
|
|
4
4
|
import {VersionedHashes} from "../../../execution/index.js";
|
|
5
5
|
import {kzgCommitmentToVersionedHash} from "../../../util/blobs.js";
|
|
@@ -24,7 +24,7 @@ import {
|
|
|
24
24
|
SourceMeta,
|
|
25
25
|
} from "./types.js";
|
|
26
26
|
|
|
27
|
-
export type BlockInput = BlockInputPreData | BlockInputBlobs | BlockInputColumns;
|
|
27
|
+
export type BlockInput = BlockInputPreData | BlockInputBlobs | BlockInputColumns | BlockInputNoData;
|
|
28
28
|
|
|
29
29
|
export function isBlockInputPreDeneb(blockInput: IBlockInput): blockInput is BlockInputPreData {
|
|
30
30
|
return blockInput.type === DAType.PreData;
|
|
@@ -37,6 +37,10 @@ export function isBlockInputColumns(blockInput: IBlockInput): blockInput is Bloc
|
|
|
37
37
|
return blockInput.type === DAType.Columns;
|
|
38
38
|
}
|
|
39
39
|
|
|
40
|
+
export function isBlockInputNoData(blockInput: IBlockInput): blockInput is BlockInputNoData {
|
|
41
|
+
return blockInput.type === DAType.NoData;
|
|
42
|
+
}
|
|
43
|
+
|
|
40
44
|
function createPromise<T>(): PromiseParts<T> {
|
|
41
45
|
let resolve!: (value: T) => void;
|
|
42
46
|
let reject!: (e: Error) => void;
|
|
@@ -903,3 +907,64 @@ export class BlockInputColumns extends AbstractBlockInput<ForkColumnsDA, fulu.Da
|
|
|
903
907
|
return Promise.resolve(this.getSampledColumns());
|
|
904
908
|
}
|
|
905
909
|
}
|
|
910
|
+
|
|
911
|
+
type BlockInputNoDataState = {
|
|
912
|
+
hasBlock: true;
|
|
913
|
+
hasAllData: true;
|
|
914
|
+
block: SignedBeaconBlock<ForkPostGloas>;
|
|
915
|
+
source: SourceMeta;
|
|
916
|
+
timeCompleteSec: number;
|
|
917
|
+
};
|
|
918
|
+
|
|
919
|
+
export class BlockInputNoData extends AbstractBlockInput<ForkPostGloas, null> {
|
|
920
|
+
type = DAType.NoData as const;
|
|
921
|
+
|
|
922
|
+
state: BlockInputNoDataState;
|
|
923
|
+
|
|
924
|
+
private constructor(init: BlockInputInit, state: BlockInputNoDataState) {
|
|
925
|
+
super(init);
|
|
926
|
+
this.state = state;
|
|
927
|
+
this.dataPromise.resolve(null);
|
|
928
|
+
this.blockPromise.resolve(state.block);
|
|
929
|
+
}
|
|
930
|
+
|
|
931
|
+
static createFromBlock(props: AddBlock<ForkPostGloas> & CreateBlockInputMeta): BlockInputNoData {
|
|
932
|
+
const init: BlockInputInit = {
|
|
933
|
+
daOutOfRange: props.daOutOfRange,
|
|
934
|
+
timeCreated: props.seenTimestampSec,
|
|
935
|
+
forkName: props.forkName,
|
|
936
|
+
slot: props.block.message.slot,
|
|
937
|
+
blockRootHex: props.blockRootHex,
|
|
938
|
+
parentRootHex: toRootHex(props.block.message.parentRoot),
|
|
939
|
+
};
|
|
940
|
+
const state: BlockInputNoDataState = {
|
|
941
|
+
hasBlock: true,
|
|
942
|
+
hasAllData: true,
|
|
943
|
+
block: props.block,
|
|
944
|
+
source: {
|
|
945
|
+
source: props.source,
|
|
946
|
+
seenTimestampSec: props.seenTimestampSec,
|
|
947
|
+
peerIdStr: props.peerIdStr,
|
|
948
|
+
},
|
|
949
|
+
timeCompleteSec: props.seenTimestampSec,
|
|
950
|
+
};
|
|
951
|
+
return new BlockInputNoData(init, state);
|
|
952
|
+
}
|
|
953
|
+
|
|
954
|
+
addBlock(_: AddBlock<ForkPostGloas>, opts = {throwOnDuplicateAdd: true}): void {
|
|
955
|
+
if (opts.throwOnDuplicateAdd) {
|
|
956
|
+
throw new BlockInputError(
|
|
957
|
+
{
|
|
958
|
+
code: BlockInputErrorCode.INVALID_CONSTRUCTION,
|
|
959
|
+
blockRoot: this.blockRootHex,
|
|
960
|
+
},
|
|
961
|
+
"Cannot addBlock to BlockInputNoData - block already exists"
|
|
962
|
+
);
|
|
963
|
+
}
|
|
964
|
+
}
|
|
965
|
+
|
|
966
|
+
getBlobKzgCommitments(): deneb.BlobKzgCommitments {
|
|
967
|
+
return (this.state.block.message.body as gloas.BeaconBlockBody).signedExecutionPayloadBid.message
|
|
968
|
+
.blobKzgCommitments;
|
|
969
|
+
}
|
|
970
|
+
}
|
|
@@ -6,6 +6,7 @@ export enum DAType {
|
|
|
6
6
|
PreData = "pre-data",
|
|
7
7
|
Blobs = "blobs",
|
|
8
8
|
Columns = "columns",
|
|
9
|
+
NoData = "no-data",
|
|
9
10
|
}
|
|
10
11
|
|
|
11
12
|
export type DAData = null | deneb.BlobSidecars | fulu.DataColumnSidecars;
|
|
@@ -99,6 +100,18 @@ export type MissingColumnMeta = {
|
|
|
99
100
|
versionedHashes: VersionedHashes;
|
|
100
101
|
};
|
|
101
102
|
|
|
103
|
+
/**
|
|
104
|
+
* Minimal interface required to write data columns to the DB.
|
|
105
|
+
* Used by `writeDataColumnsToDb` and designed to be reusable across forks (e.g. Fulu, Gloas).
|
|
106
|
+
*/
|
|
107
|
+
export interface IDataColumnsInput {
|
|
108
|
+
readonly slot: Slot;
|
|
109
|
+
readonly blockRootHex: string;
|
|
110
|
+
getCustodyColumns(): fulu.DataColumnSidecars;
|
|
111
|
+
hasComputedAllData(): boolean;
|
|
112
|
+
waitForComputedAllData(timeout: number, signal?: AbortSignal): Promise<fulu.DataColumnSidecars>;
|
|
113
|
+
}
|
|
114
|
+
|
|
102
115
|
/**
|
|
103
116
|
* This is used to validate that BlockInput implementations follow some minimal subset of operations
|
|
104
117
|
* and that adding a new implementation won't break consumers that rely on this subset.
|
|
@@ -20,7 +20,7 @@ import {
|
|
|
20
20
|
isStartSlotOfEpoch,
|
|
21
21
|
isStateValidatorsNodesPopulated,
|
|
22
22
|
} from "@lodestar/state-transition";
|
|
23
|
-
import {Attestation, BeaconBlock, altair, capella, electra, phase0, ssz} from "@lodestar/types";
|
|
23
|
+
import {Attestation, BeaconBlock, altair, capella, electra, isGloasBeaconBlock, phase0, ssz} from "@lodestar/types";
|
|
24
24
|
import {isErrorAborted, toRootHex} from "@lodestar/utils";
|
|
25
25
|
import {ZERO_HASH_HEX} from "../../constants/index.js";
|
|
26
26
|
import {callInNextEventLoop} from "../../util/eventLoop.js";
|
|
@@ -95,7 +95,7 @@ export async function importBlock(
|
|
|
95
95
|
// Without this, a supernode syncing from behind can accumulate many blocks worth of column
|
|
96
96
|
// data in memory (up to 128 columns per block) causing OOM before persistence catches up.
|
|
97
97
|
await this.unfinalizedBlockWrites.waitForSpace();
|
|
98
|
-
this.unfinalizedBlockWrites.push(
|
|
98
|
+
this.unfinalizedBlockWrites.push(blockInput).catch((e) => {
|
|
99
99
|
if (!isQueueErrorAborted(e)) {
|
|
100
100
|
this.logger.error("Error pushing block to unfinalized write queue", {slot: blockSlot}, e as Error);
|
|
101
101
|
}
|
|
@@ -230,6 +230,32 @@ export async function importBlock(
|
|
|
230
230
|
}
|
|
231
231
|
}
|
|
232
232
|
|
|
233
|
+
// 4.5. Import payload attestations to fork choice (Gloas)
|
|
234
|
+
//
|
|
235
|
+
if (isGloasBeaconBlock(block.message)) {
|
|
236
|
+
for (const payloadAttestation of block.message.body.payloadAttestations) {
|
|
237
|
+
try {
|
|
238
|
+
// Extract PTC indices from aggregation bits
|
|
239
|
+
const ptcIndices: number[] = [];
|
|
240
|
+
for (let i = 0; i < payloadAttestation.aggregationBits.bitLen; i++) {
|
|
241
|
+
if (payloadAttestation.aggregationBits.get(i)) {
|
|
242
|
+
ptcIndices.push(i);
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
|
|
246
|
+
if (ptcIndices.length > 0) {
|
|
247
|
+
this.forkChoice.notifyPtcMessages(
|
|
248
|
+
toRootHex(payloadAttestation.data.beaconBlockRoot),
|
|
249
|
+
ptcIndices,
|
|
250
|
+
payloadAttestation.data.payloadPresent
|
|
251
|
+
);
|
|
252
|
+
}
|
|
253
|
+
} catch (e) {
|
|
254
|
+
this.logger.warn("Error processing PayloadAttestation from block", {slot: blockSlot}, e as Error);
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
}
|
|
258
|
+
|
|
233
259
|
// 5. Compute head. If new head, immediately stateCache.setHeadState()
|
|
234
260
|
|
|
235
261
|
const oldHead = this.forkChoice.getHead();
|
|
@@ -345,7 +371,7 @@ export async function importBlock(
|
|
|
345
371
|
// 3) Proposer boost reorg related flag is turned on (this is checked inside the function)
|
|
346
372
|
// 4) Block meets the criteria of being re-orged out (this is also checked inside the function)
|
|
347
373
|
const result = this.forkChoice.shouldOverrideForkChoiceUpdate(
|
|
348
|
-
blockSummary
|
|
374
|
+
blockSummary,
|
|
349
375
|
this.clock.secFromSlot(currentSlot),
|
|
350
376
|
currentSlot
|
|
351
377
|
);
|
|
@@ -441,7 +467,12 @@ export async function importBlock(
|
|
|
441
467
|
this.metrics?.currentActiveValidators.set(activeValidatorsCount);
|
|
442
468
|
this.metrics?.currentValidators.set({status: "active"}, activeValidatorsCount);
|
|
443
469
|
|
|
444
|
-
const parentBlockSummary =
|
|
470
|
+
const parentBlockSummary = isGloasBeaconBlock(block.message)
|
|
471
|
+
? this.forkChoice.getBlockHexAndBlockHash(
|
|
472
|
+
toRootHex(checkpointState.latestBlockHeader.parentRoot),
|
|
473
|
+
toRootHex(block.message.body.signedExecutionPayloadBid.message.parentBlockHash)
|
|
474
|
+
)
|
|
475
|
+
: this.forkChoice.getBlockDefaultStatus(checkpointState.latestBlockHeader.parentRoot);
|
|
445
476
|
|
|
446
477
|
if (parentBlockSummary) {
|
|
447
478
|
const justifiedCheckpoint = checkpointState.currentJustifiedCheckpoint;
|
|
@@ -29,6 +29,9 @@ export async function verifyBlocksDataAvailability(
|
|
|
29
29
|
|
|
30
30
|
const availableTime = Math.max(0, Math.max(...blocks.map((blockInput) => blockInput.getTimeComplete())));
|
|
31
31
|
const dataAvailabilityStatuses: DataAvailabilityStatus[] = blocks.map((blockInput) => {
|
|
32
|
+
if (blockInput.type === DAType.NoData) {
|
|
33
|
+
return DataAvailabilityStatus.NotRequired;
|
|
34
|
+
}
|
|
32
35
|
if (blockInput.type === DAType.PreData) {
|
|
33
36
|
return DataAvailabilityStatus.PreData;
|
|
34
37
|
}
|
|
@@ -21,7 +21,7 @@ import {Metrics} from "../../metrics/metrics.js";
|
|
|
21
21
|
import {IClock} from "../../util/clock.js";
|
|
22
22
|
import {BlockError, BlockErrorCode} from "../errors/index.js";
|
|
23
23
|
import {BlockProcessOpts} from "../options.js";
|
|
24
|
-
import {isBlockInputBlobs, isBlockInputColumns} from "./blockInput/blockInput.js";
|
|
24
|
+
import {isBlockInputBlobs, isBlockInputColumns, isBlockInputNoData} from "./blockInput/blockInput.js";
|
|
25
25
|
import {IBlockInput} from "./blockInput/types.js";
|
|
26
26
|
import {ImportBlockOpts} from "./types.js";
|
|
27
27
|
|
|
@@ -51,7 +51,8 @@ type VerifyBlockExecutionResponse =
|
|
|
51
51
|
| VerifyExecutionErrorResponse
|
|
52
52
|
| {executionStatus: ExecutionStatus.Valid; lvhResponse: LVHValidResponse; execError: null}
|
|
53
53
|
| {executionStatus: ExecutionStatus.Syncing; lvhResponse?: LVHValidResponse; execError: null}
|
|
54
|
-
| {executionStatus: ExecutionStatus.PreMerge; lvhResponse: undefined; execError: null}
|
|
54
|
+
| {executionStatus: ExecutionStatus.PreMerge; lvhResponse: undefined; execError: null}
|
|
55
|
+
| {executionStatus: ExecutionStatus.PayloadSeparated; lvhResponse: undefined; execError: null};
|
|
55
56
|
|
|
56
57
|
/**
|
|
57
58
|
* Verifies 1 or more execution payloads from a linear sequence of blocks.
|
|
@@ -148,6 +149,12 @@ export async function verifyBlockExecutionPayload(
|
|
|
148
149
|
preState0: CachedBeaconStateAllForks
|
|
149
150
|
): Promise<VerifyBlockExecutionResponse> {
|
|
150
151
|
const block = blockInput.getBlock();
|
|
152
|
+
|
|
153
|
+
// Gloas block doesn't have execution payload. Return right away
|
|
154
|
+
if (isBlockInputNoData(blockInput)) {
|
|
155
|
+
return {executionStatus: ExecutionStatus.PayloadSeparated, lvhResponse: undefined, execError: null};
|
|
156
|
+
}
|
|
157
|
+
|
|
151
158
|
/** Not null if execution is enabled */
|
|
152
159
|
const executionPayloadEnabled =
|
|
153
160
|
isExecutionStateType(preState0) &&
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import {ChainForkConfig} from "@lodestar/config";
|
|
2
2
|
import {IForkChoice, ProtoBlock} from "@lodestar/fork-choice";
|
|
3
3
|
import {computeStartSlotAtEpoch} from "@lodestar/state-transition";
|
|
4
|
-
import {RootHex, Slot} from "@lodestar/types";
|
|
4
|
+
import {RootHex, Slot, isGloasBeaconBlock} from "@lodestar/types";
|
|
5
5
|
import {toRootHex} from "@lodestar/utils";
|
|
6
6
|
import {IClock} from "../../util/clock.js";
|
|
7
7
|
import {BlockError, BlockErrorCode} from "../errors/index.js";
|
|
@@ -90,7 +90,12 @@ export function verifyBlocksSanityChecks(
|
|
|
90
90
|
} else {
|
|
91
91
|
// When importing a block segment, only the first NON-IGNORED block must be known to the fork-choice.
|
|
92
92
|
const parentRoot = toRootHex(block.message.parentRoot);
|
|
93
|
-
parentBlock =
|
|
93
|
+
parentBlock = isGloasBeaconBlock(block.message)
|
|
94
|
+
? chain.forkChoice.getBlockHexAndBlockHash(
|
|
95
|
+
parentRoot,
|
|
96
|
+
toRootHex(block.message.body.signedExecutionPayloadBid.message.parentBlockHash)
|
|
97
|
+
)
|
|
98
|
+
: chain.forkChoice.getBlockHexDefaultStatus(parentRoot);
|
|
94
99
|
if (!parentBlock) {
|
|
95
100
|
throw new BlockError(block, {code: BlockErrorCode.PARENT_UNKNOWN, parentRoot});
|
|
96
101
|
}
|