@lodestar/beacon-node 1.50.0 → 1.51.0-dev.15ecdb3b27
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 +7 -2
- package/lib/api/impl/beacon/blocks/index.js.map +1 -1
- package/lib/api/impl/beacon/state/index.d.ts.map +1 -1
- package/lib/api/impl/beacon/state/index.js +8 -2
- package/lib/api/impl/beacon/state/index.js.map +1 -1
- package/lib/api/impl/beacon/state/utils.d.ts +2 -1
- package/lib/api/impl/beacon/state/utils.d.ts.map +1 -1
- package/lib/api/impl/beacon/state/utils.js +17 -9
- package/lib/api/impl/beacon/state/utils.js.map +1 -1
- package/lib/api/impl/debug/index.d.ts.map +1 -1
- package/lib/api/impl/debug/index.js +3 -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 +133 -27
- package/lib/api/impl/validator/index.js.map +1 -1
- package/lib/chain/ColumnReconstructionTracker.d.ts +11 -13
- package/lib/chain/ColumnReconstructionTracker.d.ts.map +1 -1
- package/lib/chain/ColumnReconstructionTracker.js +49 -44
- package/lib/chain/ColumnReconstructionTracker.js.map +1 -1
- package/lib/chain/archiveStore/utils/archiveBlocks.d.ts.map +1 -1
- package/lib/chain/archiveStore/utils/archiveBlocks.js +4 -5
- package/lib/chain/archiveStore/utils/archiveBlocks.js.map +1 -1
- package/lib/chain/blocks/blockInput/blockInput.d.ts +1 -1
- package/lib/chain/blocks/blockInput/blockInput.d.ts.map +1 -1
- package/lib/chain/blocks/blockInput/blockInput.js.map +1 -1
- package/lib/chain/blocks/blockInput/utils.js +2 -2
- package/lib/chain/blocks/blockInput/utils.js.map +1 -1
- package/lib/chain/blocks/importBlock.js +10 -6
- package/lib/chain/blocks/importBlock.js.map +1 -1
- package/lib/chain/blocks/importExecutionPayload.d.ts.map +1 -1
- package/lib/chain/blocks/importExecutionPayload.js +49 -2
- package/lib/chain/blocks/importExecutionPayload.js.map +1 -1
- package/lib/chain/blocks/types.d.ts +4 -0
- package/lib/chain/blocks/types.d.ts.map +1 -1
- package/lib/chain/blocks/types.js +5 -0
- package/lib/chain/blocks/types.js.map +1 -1
- package/lib/chain/chain.d.ts +2 -1
- package/lib/chain/chain.d.ts.map +1 -1
- package/lib/chain/chain.js +8 -3
- package/lib/chain/chain.js.map +1 -1
- package/lib/chain/errors/executionPayloadBid.d.ts +11 -1
- package/lib/chain/errors/executionPayloadBid.d.ts.map +1 -1
- package/lib/chain/errors/executionPayloadBid.js +2 -0
- package/lib/chain/errors/executionPayloadBid.js.map +1 -1
- package/lib/chain/errors/inclusionList.d.ts +60 -0
- package/lib/chain/errors/inclusionList.d.ts.map +1 -0
- package/lib/chain/errors/inclusionList.js +19 -0
- package/lib/chain/errors/inclusionList.js.map +1 -0
- package/lib/chain/errors/index.d.ts +1 -0
- package/lib/chain/errors/index.d.ts.map +1 -1
- package/lib/chain/errors/index.js +1 -0
- package/lib/chain/errors/index.js.map +1 -1
- package/lib/chain/interface.d.ts +3 -2
- package/lib/chain/interface.d.ts.map +1 -1
- package/lib/chain/interface.js.map +1 -1
- package/lib/chain/opPools/inclusionListStore.d.ts +63 -0
- package/lib/chain/opPools/inclusionListStore.d.ts.map +1 -0
- package/lib/chain/opPools/inclusionListStore.js +171 -0
- package/lib/chain/opPools/inclusionListStore.js.map +1 -0
- package/lib/chain/opPools/index.d.ts +1 -0
- package/lib/chain/opPools/index.d.ts.map +1 -1
- package/lib/chain/opPools/index.js +1 -0
- package/lib/chain/opPools/index.js.map +1 -1
- package/lib/chain/prepareNextSlot.d.ts.map +1 -1
- package/lib/chain/prepareNextSlot.js +4 -3
- package/lib/chain/prepareNextSlot.js.map +1 -1
- package/lib/chain/produceBlock/computeNewStateRoot.d.ts.map +1 -1
- package/lib/chain/produceBlock/computeNewStateRoot.js.map +1 -1
- package/lib/chain/produceBlock/produceBlockBody.d.ts +3 -1
- package/lib/chain/produceBlock/produceBlockBody.d.ts.map +1 -1
- package/lib/chain/produceBlock/produceBlockBody.js +37 -14
- package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
- package/lib/chain/regen/interface.d.ts +1 -0
- package/lib/chain/regen/interface.d.ts.map +1 -1
- package/lib/chain/regen/interface.js +1 -0
- package/lib/chain/regen/interface.js.map +1 -1
- package/lib/chain/reprocess.d.ts +2 -1
- package/lib/chain/reprocess.d.ts.map +1 -1
- package/lib/chain/reprocess.js +2 -1
- package/lib/chain/reprocess.js.map +1 -1
- package/lib/chain/seenCache/seenGossipBlockInput.d.ts.map +1 -1
- package/lib/chain/seenCache/seenGossipBlockInput.js +1 -1
- package/lib/chain/seenCache/seenGossipBlockInput.js.map +1 -1
- package/lib/chain/stateCache/persistentCheckpointsCache.d.ts.map +1 -1
- package/lib/chain/stateCache/persistentCheckpointsCache.js +1 -1
- package/lib/chain/stateCache/persistentCheckpointsCache.js.map +1 -1
- package/lib/chain/validation/executionPayloadBid.d.ts.map +1 -1
- package/lib/chain/validation/executionPayloadBid.js +33 -1
- package/lib/chain/validation/executionPayloadBid.js.map +1 -1
- package/lib/chain/validation/inclusionList.d.ts +14 -0
- package/lib/chain/validation/inclusionList.d.ts.map +1 -0
- package/lib/chain/validation/inclusionList.js +141 -0
- package/lib/chain/validation/inclusionList.js.map +1 -0
- package/lib/chain/validation/index.d.ts +1 -0
- package/lib/chain/validation/index.d.ts.map +1 -1
- package/lib/chain/validation/index.js +1 -0
- package/lib/chain/validation/index.js.map +1 -1
- package/lib/chain/validatorMonitor.d.ts.map +1 -1
- package/lib/chain/validatorMonitor.js +6 -4
- package/lib/chain/validatorMonitor.js.map +1 -1
- package/lib/constants/constants.d.ts +1 -0
- package/lib/constants/constants.d.ts.map +1 -1
- package/lib/constants/constants.js +1 -0
- package/lib/constants/constants.js.map +1 -1
- package/lib/db/repositories/blockArchive.js +2 -2
- package/lib/db/repositories/blockArchive.js.map +1 -1
- package/lib/db/repositories/blockArchiveIndex.d.ts +1 -1
- package/lib/db/repositories/blockArchiveIndex.d.ts.map +1 -1
- package/lib/db/repositories/blockArchiveIndex.js +1 -2
- package/lib/db/repositories/blockArchiveIndex.js.map +1 -1
- package/lib/execution/builder/validateBid.d.ts.map +1 -1
- package/lib/execution/builder/validateBid.js +14 -1
- package/lib/execution/builder/validateBid.js.map +1 -1
- package/lib/execution/engine/disabled.d.ts +1 -0
- package/lib/execution/engine/disabled.d.ts.map +1 -1
- package/lib/execution/engine/disabled.js +3 -0
- package/lib/execution/engine/disabled.js.map +1 -1
- package/lib/execution/engine/http.d.ts +8 -2
- package/lib/execution/engine/http.d.ts.map +1 -1
- package/lib/execution/engine/http.js +28 -4
- package/lib/execution/engine/http.js.map +1 -1
- package/lib/execution/engine/index.d.ts.map +1 -1
- package/lib/execution/engine/index.js +1 -1
- package/lib/execution/engine/index.js.map +1 -1
- package/lib/execution/engine/interface.d.ts +11 -2
- package/lib/execution/engine/interface.d.ts.map +1 -1
- package/lib/execution/engine/interface.js.map +1 -1
- package/lib/execution/engine/jsonRpcHttpClient.d.ts.map +1 -1
- package/lib/execution/engine/jsonRpcHttpClient.js +14 -4
- package/lib/execution/engine/jsonRpcHttpClient.js.map +1 -1
- package/lib/execution/engine/jsonRpcTransport.d.ts +3 -2
- package/lib/execution/engine/jsonRpcTransport.d.ts.map +1 -1
- package/lib/execution/engine/jsonRpcTransport.js +33 -9
- package/lib/execution/engine/jsonRpcTransport.js.map +1 -1
- package/lib/execution/engine/mock.d.ts +1 -0
- package/lib/execution/engine/mock.d.ts.map +1 -1
- package/lib/execution/engine/mock.js +25 -3
- package/lib/execution/engine/mock.js.map +1 -1
- package/lib/execution/engine/payloadIdCache.d.ts +4 -1
- package/lib/execution/engine/payloadIdCache.d.ts.map +1 -1
- package/lib/execution/engine/payloadIdCache.js +13 -2
- package/lib/execution/engine/payloadIdCache.js.map +1 -1
- package/lib/execution/engine/restTransport.d.ts +5 -2
- package/lib/execution/engine/restTransport.d.ts.map +1 -1
- package/lib/execution/engine/restTransport.js +36 -21
- package/lib/execution/engine/restTransport.js.map +1 -1
- package/lib/execution/engine/transport.d.ts +5 -2
- package/lib/execution/engine/transport.d.ts.map +1 -1
- package/lib/execution/engine/transportMetrics.d.ts +5 -1
- package/lib/execution/engine/transportMetrics.d.ts.map +1 -1
- package/lib/execution/engine/types.d.ts +24 -0
- package/lib/execution/engine/types.d.ts.map +1 -1
- package/lib/execution/engine/types.js +24 -11
- package/lib/execution/engine/types.js.map +1 -1
- package/lib/metrics/metrics/beacon.d.ts +16 -0
- package/lib/metrics/metrics/beacon.d.ts.map +1 -1
- package/lib/metrics/metrics/beacon.js +35 -0
- package/lib/metrics/metrics/beacon.js.map +1 -1
- package/lib/metrics/metrics/lodestar.d.ts +20 -0
- package/lib/metrics/metrics/lodestar.d.ts.map +1 -1
- package/lib/metrics/metrics/lodestar.js +51 -1
- package/lib/metrics/metrics/lodestar.js.map +1 -1
- package/lib/network/gossip/gossipsub.d.ts.map +1 -1
- package/lib/network/gossip/gossipsub.js +3 -1
- package/lib/network/gossip/gossipsub.js.map +1 -1
- package/lib/network/gossip/interface.d.ts +8 -2
- package/lib/network/gossip/interface.d.ts.map +1 -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 +8 -14
- package/lib/network/gossip/topic.d.ts.map +1 -1
- package/lib/network/gossip/topic.js +13 -1
- package/lib/network/gossip/topic.js.map +1 -1
- package/lib/network/interface.d.ts +2 -1
- package/lib/network/interface.d.ts.map +1 -1
- package/lib/network/network.d.ts +2 -1
- package/lib/network/network.d.ts.map +1 -1
- package/lib/network/network.js +5 -0
- package/lib/network/network.js.map +1 -1
- package/lib/network/peers/utils/enrSubnetsDeserialize.d.ts.map +1 -1
- package/lib/network/peers/utils/enrSubnetsDeserialize.js +5 -2
- package/lib/network/peers/utils/enrSubnetsDeserialize.js.map +1 -1
- package/lib/network/processor/gossipHandlers.d.ts.map +1 -1
- package/lib/network/processor/gossipHandlers.js +40 -1
- package/lib/network/processor/gossipHandlers.js.map +1 -1
- package/lib/network/processor/gossipQueues/index.d.ts.map +1 -1
- package/lib/network/processor/gossipQueues/index.js +6 -0
- package/lib/network/processor/gossipQueues/index.js.map +1 -1
- package/lib/network/processor/gossipValidatorFn.d.ts.map +1 -1
- package/lib/network/processor/gossipValidatorFn.js +5 -1
- package/lib/network/processor/gossipValidatorFn.js.map +1 -1
- package/lib/network/processor/index.d.ts +5 -0
- package/lib/network/processor/index.d.ts.map +1 -1
- package/lib/network/processor/index.js +40 -29
- package/lib/network/processor/index.js.map +1 -1
- package/lib/network/reqresp/ReqRespBeaconNode.d.ts.map +1 -1
- package/lib/network/reqresp/ReqRespBeaconNode.js +6 -0
- package/lib/network/reqresp/ReqRespBeaconNode.js.map +1 -1
- package/lib/network/reqresp/handlers/dataColumnSidecarsByRange.d.ts.map +1 -1
- package/lib/network/reqresp/handlers/dataColumnSidecarsByRange.js +4 -4
- package/lib/network/reqresp/handlers/dataColumnSidecarsByRange.js.map +1 -1
- package/lib/network/reqresp/handlers/dataColumnSidecarsByRoot.js +3 -3
- package/lib/network/reqresp/handlers/dataColumnSidecarsByRoot.js.map +1 -1
- package/lib/network/reqresp/handlers/inclusionListsByIndices.d.ts +10 -0
- package/lib/network/reqresp/handlers/inclusionListsByIndices.d.ts.map +1 -0
- package/lib/network/reqresp/handlers/inclusionListsByIndices.js +30 -0
- package/lib/network/reqresp/handlers/inclusionListsByIndices.js.map +1 -0
- package/lib/network/reqresp/handlers/index.d.ts.map +1 -1
- package/lib/network/reqresp/handlers/index.js +5 -0
- package/lib/network/reqresp/handlers/index.js.map +1 -1
- package/lib/network/reqresp/protocols.d.ts +1 -0
- package/lib/network/reqresp/protocols.d.ts.map +1 -1
- package/lib/network/reqresp/protocols.js +5 -0
- package/lib/network/reqresp/protocols.js.map +1 -1
- package/lib/network/reqresp/rateLimit.d.ts.map +1 -1
- package/lib/network/reqresp/rateLimit.js +6 -2
- package/lib/network/reqresp/rateLimit.js.map +1 -1
- package/lib/network/reqresp/types.d.ts +5 -2
- package/lib/network/reqresp/types.d.ts.map +1 -1
- package/lib/network/reqresp/types.js +3 -0
- package/lib/network/reqresp/types.js.map +1 -1
- package/lib/network/subnets/attnetsService.d.ts.map +1 -1
- package/lib/network/subnets/attnetsService.js +3 -1
- package/lib/network/subnets/attnetsService.js.map +1 -1
- package/lib/node/notifier.d.ts.map +1 -1
- package/lib/node/notifier.js +12 -13
- package/lib/node/notifier.js.map +1 -1
- package/lib/sync/unknownBlock.d.ts.map +1 -1
- package/lib/sync/unknownBlock.js +3 -2
- package/lib/sync/unknownBlock.js.map +1 -1
- package/lib/util/clock.d.ts.map +1 -1
- package/lib/util/clock.js +3 -4
- package/lib/util/clock.js.map +1 -1
- package/lib/util/sszBytes.d.ts +2 -2
- package/lib/util/sszBytes.d.ts.map +1 -1
- package/lib/util/sszBytes.js +22 -14
- package/lib/util/sszBytes.js.map +1 -1
- package/package.json +15 -15
- package/src/api/impl/beacon/blocks/index.ts +10 -3
- package/src/api/impl/beacon/state/index.ts +10 -1
- package/src/api/impl/beacon/state/utils.ts +19 -9
- package/src/api/impl/debug/index.ts +4 -0
- package/src/api/impl/validator/index.ts +173 -29
- package/src/chain/ColumnReconstructionTracker.ts +63 -46
- package/src/chain/archiveStore/utils/archiveBlocks.ts +6 -7
- package/src/chain/blocks/blockInput/blockInput.ts +1 -1
- package/src/chain/blocks/blockInput/utils.ts +2 -2
- package/src/chain/blocks/importBlock.ts +11 -11
- package/src/chain/blocks/importExecutionPayload.ts +67 -2
- package/src/chain/blocks/types.ts +5 -0
- package/src/chain/chain.ts +8 -2
- package/src/chain/errors/executionPayloadBid.ts +12 -0
- package/src/chain/errors/inclusionList.ts +38 -0
- package/src/chain/errors/index.ts +1 -0
- package/src/chain/interface.ts +4 -1
- package/src/chain/opPools/inclusionListStore.ts +208 -0
- package/src/chain/opPools/index.ts +1 -0
- package/src/chain/prepareNextSlot.ts +7 -3
- package/src/chain/produceBlock/computeNewStateRoot.ts +9 -2
- package/src/chain/produceBlock/produceBlockBody.ts +70 -23
- package/src/chain/regen/interface.ts +1 -0
- package/src/chain/reprocess.ts +2 -1
- package/src/chain/seenCache/seenGossipBlockInput.ts +2 -1
- package/src/chain/stateCache/persistentCheckpointsCache.ts +4 -1
- package/src/chain/validation/executionPayloadBid.ts +52 -2
- package/src/chain/validation/inclusionList.ts +183 -0
- package/src/chain/validation/index.ts +1 -0
- package/src/chain/validatorMonitor.ts +7 -4
- package/src/constants/constants.ts +1 -0
- package/src/db/repositories/blockArchive.ts +2 -2
- package/src/db/repositories/blockArchiveIndex.ts +2 -3
- package/src/execution/builder/validateBid.ts +23 -2
- package/src/execution/engine/disabled.ts +4 -0
- package/src/execution/engine/http.ts +41 -5
- package/src/execution/engine/index.ts +2 -1
- package/src/execution/engine/interface.ts +27 -3
- package/src/execution/engine/jsonRpcHttpClient.ts +12 -5
- package/src/execution/engine/jsonRpcTransport.ts +46 -9
- package/src/execution/engine/mock.ts +26 -3
- package/src/execution/engine/payloadIdCache.ts +23 -4
- package/src/execution/engine/restTransport.ts +68 -23
- package/src/execution/engine/transport.ts +7 -2
- package/src/execution/engine/transportMetrics.ts +2 -1
- package/src/execution/engine/types.ts +48 -11
- package/src/metrics/metrics/beacon.ts +37 -0
- package/src/metrics/metrics/lodestar.ts +53 -1
- package/src/network/gossip/gossipsub.ts +3 -1
- package/src/network/gossip/interface.ts +5 -0
- package/src/network/gossip/topic.ts +14 -0
- package/src/network/interface.ts +2 -0
- package/src/network/network.ts +11 -0
- package/src/network/peers/utils/enrSubnetsDeserialize.ts +5 -2
- package/src/network/processor/gossipHandlers.ts +52 -1
- package/src/network/processor/gossipQueues/index.ts +6 -0
- package/src/network/processor/gossipValidatorFn.ts +5 -0
- package/src/network/processor/index.ts +36 -27
- package/src/network/processor/types.ts +1 -1
- package/src/network/reqresp/ReqRespBeaconNode.ts +7 -0
- package/src/network/reqresp/handlers/dataColumnSidecarsByRange.ts +4 -10
- package/src/network/reqresp/handlers/dataColumnSidecarsByRoot.ts +3 -3
- package/src/network/reqresp/handlers/inclusionListsByIndices.ts +44 -0
- package/src/network/reqresp/handlers/index.ts +5 -0
- package/src/network/reqresp/protocols.ts +6 -0
- package/src/network/reqresp/rateLimit.ts +6 -2
- package/src/network/reqresp/types.ts +6 -0
- package/src/network/subnets/attnetsService.ts +8 -3
- package/src/node/notifier.ts +14 -13
- package/src/sync/unknownBlock.ts +3 -2
- package/src/util/clock.ts +3 -4
- package/src/util/sszBytes.ts +25 -12
|
@@ -0,0 +1,208 @@
|
|
|
1
|
+
import {BitArray} from "@chainsafe/ssz";
|
|
2
|
+
import {BeaconConfig} from "@lodestar/config";
|
|
3
|
+
import {INCLUSION_LIST_COMMITTEE_SIZE} from "@lodestar/params";
|
|
4
|
+
import {RootHex, Slot, ValidatorIndex, bellatrix, heze, ssz} from "@lodestar/types";
|
|
5
|
+
import {MapDef, toHex, toRootHex} from "@lodestar/utils";
|
|
6
|
+
|
|
7
|
+
export enum InclusionListInsertOutcome {
|
|
8
|
+
/** Stored as a new entry. */
|
|
9
|
+
New = "New",
|
|
10
|
+
/** Slot is older than the prune horizon. */
|
|
11
|
+
Old = "Old",
|
|
12
|
+
/** Identical inclusion list already stored. */
|
|
13
|
+
Seen = "Seen",
|
|
14
|
+
/** New equivocation evidence: this validator already has a different inclusion list stored. */
|
|
15
|
+
Equivocating = "Equivocating",
|
|
16
|
+
/** Validator was already marked as an equivocator for this `(slot, dependent_root)`. */
|
|
17
|
+
SubsequentEquivocation = "SubsequentEquivocation",
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
type InclusionListEntry = {
|
|
21
|
+
signedInclusionList: heze.SignedInclusionList;
|
|
22
|
+
/** Positions of the validator in `get_inclusion_list_committee(state, slot)`, several when the committee cycles */
|
|
23
|
+
committeeIndices: number[];
|
|
24
|
+
/** Received before the inclusion list deadline of its slot. */
|
|
25
|
+
timely: boolean;
|
|
26
|
+
};
|
|
27
|
+
|
|
28
|
+
/**
|
|
29
|
+
* Spec `InclusionListStore`: inclusion lists keyed by `(slot, dependent_root)`, one per validator index.
|
|
30
|
+
* The committee position is recorded at insert time (gossip validation resolves it) so the bit-oriented
|
|
31
|
+
* reads need no shuffling lookup. Signed lists are kept so InclusionListsByIndices can serve them.
|
|
32
|
+
* A validator's first list stays stored and an equivocation marks the validator so reads skip it.
|
|
33
|
+
*/
|
|
34
|
+
export class InclusionListStore {
|
|
35
|
+
/** slot -> dependent_root -> validator index -> entry */
|
|
36
|
+
private readonly inclusionLists = new MapDef<Slot, MapDef<RootHex, Map<ValidatorIndex, InclusionListEntry>>>(
|
|
37
|
+
() => new MapDef<RootHex, Map<ValidatorIndex, InclusionListEntry>>(() => new Map())
|
|
38
|
+
);
|
|
39
|
+
/** slot -> dependent_root -> equivocating validator indices */
|
|
40
|
+
private readonly equivocators = new MapDef<Slot, MapDef<RootHex, Set<ValidatorIndex>>>(
|
|
41
|
+
() => new MapDef<RootHex, Set<ValidatorIndex>>(() => new Set())
|
|
42
|
+
);
|
|
43
|
+
/** slot -> dependent_root -> validator index -> count, for the p2p "first or second message" rule */
|
|
44
|
+
private readonly seenCounts = new MapDef<Slot, MapDef<RootHex, Map<ValidatorIndex, number>>>(
|
|
45
|
+
() => new MapDef<RootHex, Map<ValidatorIndex, number>>(() => new Map())
|
|
46
|
+
);
|
|
47
|
+
|
|
48
|
+
private lowestPermissibleSlot = 0;
|
|
49
|
+
|
|
50
|
+
constructor(private readonly config: BeaconConfig) {}
|
|
51
|
+
|
|
52
|
+
get size(): number {
|
|
53
|
+
let count = 0;
|
|
54
|
+
for (const byDependentRoot of this.inclusionLists.values()) {
|
|
55
|
+
for (const entries of byDependentRoot.values()) {
|
|
56
|
+
count += entries.size;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
return count;
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
/**
|
|
63
|
+
* Late lists are stored with `timely=false` rather than dropped: they still count toward the
|
|
64
|
+
* non-timely view used to validate another node's `inclusion_list_bits`.
|
|
65
|
+
*/
|
|
66
|
+
process(
|
|
67
|
+
signedInclusionList: heze.SignedInclusionList,
|
|
68
|
+
committeeIndices: number[],
|
|
69
|
+
timely: boolean
|
|
70
|
+
): InclusionListInsertOutcome {
|
|
71
|
+
const inclusionList = signedInclusionList.message;
|
|
72
|
+
const {slot, validatorIndex} = inclusionList;
|
|
73
|
+
|
|
74
|
+
if (slot < this.lowestPermissibleSlot) {
|
|
75
|
+
return InclusionListInsertOutcome.Old;
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
const dependentRoot = toRootHex(inclusionList.dependentRoot);
|
|
79
|
+
const stored = this.inclusionLists.getOrDefault(slot).getOrDefault(dependentRoot);
|
|
80
|
+
|
|
81
|
+
const entry = stored.get(validatorIndex);
|
|
82
|
+
if (entry !== undefined) {
|
|
83
|
+
if (ssz.heze.InclusionList.equals(entry.signedInclusionList.message, inclusionList)) {
|
|
84
|
+
return InclusionListInsertOutcome.Seen;
|
|
85
|
+
}
|
|
86
|
+
const equivocators = this.equivocators.getOrDefault(slot).getOrDefault(dependentRoot);
|
|
87
|
+
if (equivocators.has(validatorIndex)) {
|
|
88
|
+
return InclusionListInsertOutcome.SubsequentEquivocation;
|
|
89
|
+
}
|
|
90
|
+
equivocators.add(validatorIndex);
|
|
91
|
+
return InclusionListInsertOutcome.Equivocating;
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
stored.set(validatorIndex, {signedInclusionList, committeeIndices, timely});
|
|
95
|
+
return InclusionListInsertOutcome.New;
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
/** Count a valid message of `validatorIndex` for the first-or-second message gossip rule */
|
|
99
|
+
markSeen(slot: Slot, dependentRoot: RootHex, validatorIndex: ValidatorIndex): void {
|
|
100
|
+
const counts = this.seenCounts.getOrDefault(slot).getOrDefault(dependentRoot);
|
|
101
|
+
counts.set(validatorIndex, (counts.get(validatorIndex) ?? 0) + 1);
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
/** Gossip rule: at most two valid messages per validator for a `(slot, dependent_root)` */
|
|
105
|
+
seenTwice(slot: Slot, dependentRoot: RootHex, validatorIndex: ValidatorIndex): boolean {
|
|
106
|
+
return (this.seenCounts.get(slot)?.get(dependentRoot)?.get(validatorIndex) ?? 0) >= 2;
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
/** Deduplicated transactions from valid, non-equivocating inclusion lists at `(slot, dependentRoot)`. */
|
|
110
|
+
getInclusionListTransactions(slot: Slot, dependentRoot: RootHex, onlyTimely = true): bellatrix.Transactions {
|
|
111
|
+
const transactions: bellatrix.Transactions = [];
|
|
112
|
+
const seen = new Set<string>();
|
|
113
|
+
|
|
114
|
+
for (const {signedInclusionList} of this.getEligible(slot, dependentRoot, onlyTimely)) {
|
|
115
|
+
for (const transaction of signedInclusionList.message.transactions) {
|
|
116
|
+
const key = toHex(transaction);
|
|
117
|
+
if (!seen.has(key)) {
|
|
118
|
+
seen.add(key);
|
|
119
|
+
transactions.push(transaction);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
return transactions;
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
/** Bit `i` is set when committee member `i` submitted a valid, non-equivocating inclusion list */
|
|
128
|
+
getInclusionListBits(slot: Slot, dependentRoot: RootHex, onlyTimely = true): BitArray {
|
|
129
|
+
const bits = BitArray.fromBitLen(INCLUSION_LIST_COMMITTEE_SIZE);
|
|
130
|
+
for (const {committeeIndices} of this.getEligible(slot, dependentRoot, onlyTimely)) {
|
|
131
|
+
for (const committeeIndex of committeeIndices) {
|
|
132
|
+
bits.set(committeeIndex, true);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
return bits;
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
/**
|
|
139
|
+
* True if `bits` has a bit set for every bit set in the local inclusion list bits.
|
|
140
|
+
*
|
|
141
|
+
* Intentionally deviates from the spec by only checking against timely lists, where the proposer would check
|
|
142
|
+
* against every list it observed (only_timely=False in
|
|
143
|
+
* https://github.com/ethereum/consensus-specs/blob/v1.7.0-beta.4/specs/heze/validator.md#signed-execution-payload-bid).
|
|
144
|
+
* A bid that passed gossip must stay eligible, otherwise a list released after the deadline voids every bid and
|
|
145
|
+
* a high early bid with empty bits crowds out the rest without ever paying.
|
|
146
|
+
*/
|
|
147
|
+
isInclusionListBitsInclusive(slot: Slot, dependentRoot: RootHex, bits: BitArray): boolean {
|
|
148
|
+
for (const {committeeIndices} of this.getEligible(slot, dependentRoot, true)) {
|
|
149
|
+
if (committeeIndices.some((committeeIndex) => !bits.get(committeeIndex))) {
|
|
150
|
+
return false;
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
return true;
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
/** Inclusion lists for the given committee positions, to serve InclusionListsByIndices. */
|
|
157
|
+
getByIndices(slot: Slot, dependentRoot: RootHex, indices: BitArray): heze.SignedInclusionList[] {
|
|
158
|
+
const out: heze.SignedInclusionList[] = [];
|
|
159
|
+
for (const {signedInclusionList, committeeIndices} of this.getEligible(slot, dependentRoot, false)) {
|
|
160
|
+
if (committeeIndices.some((committeeIndex) => indices.get(committeeIndex))) {
|
|
161
|
+
out.push(signedInclusionList);
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
return out;
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
/** Lists are retained for MIN_SLOTS_FOR_INCLUSION_LISTS_REQUESTS slots so InclusionListsByIndices can serve them */
|
|
168
|
+
prune(clockSlot: Slot): void {
|
|
169
|
+
const horizon = clockSlot - this.config.MIN_SLOTS_FOR_INCLUSION_LISTS_REQUESTS;
|
|
170
|
+
|
|
171
|
+
for (const slot of this.inclusionLists.keys()) {
|
|
172
|
+
if (slot < horizon) {
|
|
173
|
+
this.inclusionLists.delete(slot);
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
for (const slot of this.equivocators.keys()) {
|
|
177
|
+
if (slot < horizon) {
|
|
178
|
+
this.equivocators.delete(slot);
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
for (const slot of this.seenCounts.keys()) {
|
|
182
|
+
if (slot < horizon) {
|
|
183
|
+
this.seenCounts.delete(slot);
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
|
|
187
|
+
this.lowestPermissibleSlot = Math.max(horizon, 0);
|
|
188
|
+
}
|
|
189
|
+
|
|
190
|
+
/** Entries at `(slot, dependentRoot)` from non-equivocating validators, timely when required. */
|
|
191
|
+
private *getEligible(slot: Slot, dependentRoot: RootHex, onlyTimely: boolean): Generator<InclusionListEntry> {
|
|
192
|
+
const stored = this.inclusionLists.get(slot)?.get(dependentRoot);
|
|
193
|
+
if (!stored || stored.size === 0) {
|
|
194
|
+
return;
|
|
195
|
+
}
|
|
196
|
+
const equivocators = this.equivocators.get(slot)?.get(dependentRoot);
|
|
197
|
+
|
|
198
|
+
for (const [validatorIndex, entry] of stored) {
|
|
199
|
+
if (equivocators?.has(validatorIndex)) {
|
|
200
|
+
continue;
|
|
201
|
+
}
|
|
202
|
+
if (onlyTimely && !entry.timely) {
|
|
203
|
+
continue;
|
|
204
|
+
}
|
|
205
|
+
yield entry;
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
}
|
|
@@ -2,6 +2,7 @@ export {AggregatedAttestationPool} from "./aggregatedAttestationPool.js";
|
|
|
2
2
|
export {AttestationPool} from "./attestationPool.js";
|
|
3
3
|
export {DeferredVoluntaryExitPool} from "./deferredVoluntaryExitPool.js";
|
|
4
4
|
export {ExecutionPayloadBidPool, type PooledExecutionPayloadBid} from "./executionPayloadBidPool.js";
|
|
5
|
+
export {InclusionListInsertOutcome, InclusionListStore} from "./inclusionListStore.js";
|
|
5
6
|
export {OpPool} from "./opPool.js";
|
|
6
7
|
export {PayloadAttestationPool} from "./payloadAttestationPool.js";
|
|
7
8
|
export {ProposerPreferencesPool} from "./proposerPreferencesPool.js";
|
|
@@ -96,6 +96,7 @@ export class PrepareNextSlotScheduler {
|
|
|
96
96
|
const nextEpoch = computeEpochAtSlot(clockSlot) + 1;
|
|
97
97
|
const isEpochTransition = prepareEpoch === nextEpoch;
|
|
98
98
|
const fork = this.config.getForkName(prepareSlot);
|
|
99
|
+
const currentFork = this.config.getForkName(clockSlot);
|
|
99
100
|
|
|
100
101
|
// Early return if we are pre-genesis
|
|
101
102
|
// or we are pre-bellatrix and this is not an epoch transition
|
|
@@ -106,7 +107,7 @@ export class PrepareNextSlotScheduler {
|
|
|
106
107
|
try {
|
|
107
108
|
// At PREPARE_NEXT_SLOT_BPS (~67%) of the current slot we prepare payload for the next slot
|
|
108
109
|
// or precompute epoch transition
|
|
109
|
-
await sleep(this.config.getSlotComponentDurationMs(PREPARE_NEXT_SLOT_BPS), this.signal);
|
|
110
|
+
await sleep(this.config.getSlotComponentDurationMs(currentFork, PREPARE_NEXT_SLOT_BPS), this.signal);
|
|
110
111
|
|
|
111
112
|
// calling updateHead() here before we produce a block to reduce reorg possibility
|
|
112
113
|
const headBlock = this.chain.recomputeForkChoiceHead(ForkchoiceCaller.prepareNextSlot);
|
|
@@ -369,7 +370,7 @@ export class PrepareNextSlotScheduler {
|
|
|
369
370
|
// skip when we're the next-slot proposer — don't compete with block-production prep.
|
|
370
371
|
feeRecipient === undefined
|
|
371
372
|
) {
|
|
372
|
-
const maxDurationMs = this.config.getSlotComponentDurationMs(BUILDER_PREVERIFY_LIMIT_BPS);
|
|
373
|
+
const maxDurationMs = this.config.getSlotComponentDurationMs(currentFork, BUILDER_PREVERIFY_LIMIT_BPS);
|
|
373
374
|
const preVerifyTimer = this.metrics?.builderDepositPreVerify.duration.startTimer();
|
|
374
375
|
const result = headState.preVerifyBuilderDepositsPreGloas(MAX_BUILDER_DEPOSITS_PER_SLOT, maxDurationMs);
|
|
375
376
|
preVerifyTimer?.();
|
|
@@ -423,7 +424,10 @@ export class PrepareNextSlotScheduler {
|
|
|
423
424
|
* later in the slot, connecting at PREPARE_NEXT_SLOT_BPS would go cold before bids are requested.
|
|
424
425
|
*/
|
|
425
426
|
private checkBuilderStatusBeforeSlot(prepareSlot: Slot): void {
|
|
426
|
-
const msBeforeSlot = this.config.getSlotComponentDurationMs(
|
|
427
|
+
const msBeforeSlot = this.config.getSlotComponentDurationMs(
|
|
428
|
+
this.config.getForkName(prepareSlot - 1),
|
|
429
|
+
BUILDER_STATUS_CHECK_BEFORE_SLOT_BPS
|
|
430
|
+
);
|
|
427
431
|
const msUntilCheck = -this.chain.clock.msFromSlot(prepareSlot) - msBeforeSlot;
|
|
428
432
|
sleep(Math.max(0, msUntilCheck), this.signal)
|
|
429
433
|
.then(() => this.chain.builderApiClient.checkStatus())
|
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
import {EMPTY_SIGNATURE, IBeaconStateView, StateHashTreeRootSource} from "@lodestar/state-transition";
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
BeaconBlock,
|
|
4
|
+
BlindedBeaconBlock,
|
|
5
|
+
Gwei,
|
|
6
|
+
Root,
|
|
7
|
+
SignedBeaconBlock,
|
|
8
|
+
SignedBlindedBeaconBlock,
|
|
9
|
+
} from "@lodestar/types";
|
|
3
10
|
import {Metrics} from "../../metrics/index.js";
|
|
4
11
|
|
|
5
12
|
/**
|
|
@@ -13,7 +20,7 @@ export function computeNewStateRoot(
|
|
|
13
20
|
block: BeaconBlock | BlindedBeaconBlock
|
|
14
21
|
): {newStateRoot: Root; proposerReward: Gwei; postState: IBeaconStateView} {
|
|
15
22
|
// Set signature to zero to re-use stateTransition() function which requires the SignedBeaconBlock type
|
|
16
|
-
const signedBlock = {message: block, signature: EMPTY_SIGNATURE};
|
|
23
|
+
const signedBlock = {message: block, signature: EMPTY_SIGNATURE} as SignedBeaconBlock | SignedBlindedBeaconBlock;
|
|
17
24
|
const {newStateRoot, proposerReward, postState, hashTreeRootTime} = state.computeNewStateRoot(
|
|
18
25
|
{block: signedBlock},
|
|
19
26
|
{metrics: metrics?.stateTransition}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import {BitArray} from "@chainsafe/ssz";
|
|
2
1
|
import {ChainForkConfig} from "@lodestar/config";
|
|
3
2
|
import {
|
|
4
3
|
IForkChoice,
|
|
@@ -16,10 +15,10 @@ import {
|
|
|
16
15
|
ForkPostGloas,
|
|
17
16
|
ForkPreGloas,
|
|
18
17
|
ForkSeq,
|
|
19
|
-
INCLUSION_LIST_COMMITTEE_SIZE,
|
|
20
18
|
isForkPostAltair,
|
|
21
19
|
isForkPostBellatrix,
|
|
22
20
|
isForkPostGloas,
|
|
21
|
+
isForkPostHeze,
|
|
23
22
|
} from "@lodestar/params";
|
|
24
23
|
import {
|
|
25
24
|
G2_POINT_AT_INFINITY,
|
|
@@ -80,7 +79,7 @@ import {kzg} from "../../util/kzg.js";
|
|
|
80
79
|
import {BeaconProposerCache} from "../beaconProposerCache.js";
|
|
81
80
|
import type {BeaconChain} from "../chain.js";
|
|
82
81
|
import {CommonBlockBody} from "../interface.js";
|
|
83
|
-
import {ProposerPreferencesPool} from "../opPools/index.js";
|
|
82
|
+
import {InclusionListStore, ProposerPreferencesPool} from "../opPools/index.js";
|
|
84
83
|
import {validateBlobsAndKzgCommitments, validateCellsAndKzgCommitments} from "./validateBlobsAndKzgCommitments.js";
|
|
85
84
|
|
|
86
85
|
// Time to provide the EL to generate a payload from new payload id
|
|
@@ -390,8 +389,19 @@ export async function produceBlockBody<T extends BlockType>(
|
|
|
390
389
|
executionRequestsRoot: ssz.gloas.ExecutionRequests.hashTreeRoot(executionRequests as gloas.ExecutionRequests),
|
|
391
390
|
};
|
|
392
391
|
if (ForkSeq[fork] >= ForkSeq.heze) {
|
|
393
|
-
//
|
|
394
|
-
|
|
392
|
+
// Built from the full view (only_timely=False), a superset of the receiver's timely-only
|
|
393
|
+
// is_inclusion_list_bits_inclusive check
|
|
394
|
+
const inclusionListSlot = blockSlot - 1;
|
|
395
|
+
(bid as heze.ExecutionPayloadBid).inclusionListBits = this.inclusionListStore.getInclusionListBits(
|
|
396
|
+
inclusionListSlot,
|
|
397
|
+
getShufflingDependentRoot(
|
|
398
|
+
this.forkChoice,
|
|
399
|
+
computeEpochAtSlot(inclusionListSlot),
|
|
400
|
+
computeEpochAtSlot(parentBlock.slot),
|
|
401
|
+
parentBlock
|
|
402
|
+
),
|
|
403
|
+
false
|
|
404
|
+
);
|
|
395
405
|
}
|
|
396
406
|
const signedBid: gloas.SignedExecutionPayloadBid = {
|
|
397
407
|
message: bid,
|
|
@@ -684,12 +694,11 @@ export async function produceBlockBody<T extends BlockType>(
|
|
|
684
694
|
executionPayloadValue = BigInt(0);
|
|
685
695
|
}
|
|
686
696
|
|
|
687
|
-
const {graffiti, attestations,
|
|
697
|
+
const {graffiti, attestations, voluntaryExits, attesterSlashings, proposerSlashings} = blockBody;
|
|
688
698
|
|
|
689
699
|
Object.assign(logMeta, {
|
|
690
700
|
graffiti: fromGraffitiBytes(graffiti),
|
|
691
701
|
attestations: attestations.length,
|
|
692
|
-
deposits: deposits.length,
|
|
693
702
|
voluntaryExits: voluntaryExits.length,
|
|
694
703
|
attesterSlashings: attesterSlashings.length,
|
|
695
704
|
proposerSlashings: proposerSlashings.length,
|
|
@@ -737,6 +746,7 @@ export async function prepareExecutionPayload(
|
|
|
737
746
|
config: ChainForkConfig;
|
|
738
747
|
forkChoice: IForkChoice;
|
|
739
748
|
proposerPreferencesPool: ProposerPreferencesPool;
|
|
749
|
+
inclusionListStore: InclusionListStore;
|
|
740
750
|
},
|
|
741
751
|
logger: Logger,
|
|
742
752
|
fork: ForkPostBellatrix,
|
|
@@ -756,12 +766,26 @@ export async function prepareExecutionPayload(
|
|
|
756
766
|
const timestamp = computeTimeAtSlot(chain.config, state.slot, state.genesisTime);
|
|
757
767
|
const prevRandao = state.getRandaoMix(state.epoch);
|
|
758
768
|
|
|
769
|
+
// Post-heze the inclusion lists are part of the cache key, so a list set that changed since the
|
|
770
|
+
// payload was prepared triggers a new forkchoiceUpdated instead of reusing a payload built without them
|
|
771
|
+
let attributes = payloadAttributes;
|
|
772
|
+
if (attributes === undefined && ForkSeq[fork] >= ForkSeq.heze) {
|
|
773
|
+
attributes = preparePayloadAttributes(fork, chain, {
|
|
774
|
+
prepareState: state,
|
|
775
|
+
prepareSlot: state.slot,
|
|
776
|
+
parentBlockRoot,
|
|
777
|
+
parentBlockHash,
|
|
778
|
+
feeRecipient: suggestedFeeRecipient,
|
|
779
|
+
});
|
|
780
|
+
}
|
|
781
|
+
|
|
759
782
|
const payloadIdCached = chain.executionEngine.payloadIdCache.get({
|
|
760
783
|
headBlockHash: toRootHex(parentBlockHash),
|
|
761
784
|
finalizedBlockHash,
|
|
762
785
|
timestamp: numToQuantity(timestamp),
|
|
763
786
|
prevRandao: toHex(prevRandao),
|
|
764
787
|
suggestedFeeRecipient,
|
|
788
|
+
inclusionListTransactions: attributes?.inclusionListTransactions,
|
|
765
789
|
});
|
|
766
790
|
|
|
767
791
|
// prepareExecutionPayload will throw error via notifyForkchoiceUpdate if
|
|
@@ -782,22 +806,19 @@ export async function prepareExecutionPayload(
|
|
|
782
806
|
prepType = PayloadPreparationType.Fresh;
|
|
783
807
|
}
|
|
784
808
|
|
|
785
|
-
const attributes: PayloadAttributes =
|
|
786
|
-
payloadAttributes ??
|
|
787
|
-
preparePayloadAttributes(fork, chain, {
|
|
788
|
-
prepareState: state,
|
|
789
|
-
prepareSlot: state.slot,
|
|
790
|
-
parentBlockRoot,
|
|
791
|
-
parentBlockHash,
|
|
792
|
-
feeRecipient: suggestedFeeRecipient,
|
|
793
|
-
});
|
|
794
|
-
|
|
795
809
|
payloadId = await chain.executionEngine.notifyForkchoiceUpdate(
|
|
796
810
|
fork,
|
|
797
811
|
toRootHex(parentBlockHash),
|
|
798
812
|
safeBlockHash,
|
|
799
813
|
finalizedBlockHash,
|
|
800
|
-
attributes
|
|
814
|
+
attributes ??
|
|
815
|
+
preparePayloadAttributes(fork, chain, {
|
|
816
|
+
prepareState: state,
|
|
817
|
+
prepareSlot: state.slot,
|
|
818
|
+
parentBlockRoot,
|
|
819
|
+
parentBlockHash,
|
|
820
|
+
feeRecipient: suggestedFeeRecipient,
|
|
821
|
+
})
|
|
801
822
|
);
|
|
802
823
|
logger.verbose("Prepared payload id from execution engine", {payloadId});
|
|
803
824
|
}
|
|
@@ -842,6 +863,7 @@ export function getPayloadAttributesForSSE(
|
|
|
842
863
|
config: ChainForkConfig;
|
|
843
864
|
forkChoice: IForkChoice;
|
|
844
865
|
proposerPreferencesPool: ProposerPreferencesPool;
|
|
866
|
+
inclusionListStore: InclusionListStore;
|
|
845
867
|
},
|
|
846
868
|
{
|
|
847
869
|
prepareState,
|
|
@@ -898,6 +920,7 @@ function preparePayloadAttributes(
|
|
|
898
920
|
config: ChainForkConfig;
|
|
899
921
|
forkChoice: IForkChoice;
|
|
900
922
|
proposerPreferencesPool: ProposerPreferencesPool;
|
|
923
|
+
inclusionListStore: InclusionListStore;
|
|
901
924
|
},
|
|
902
925
|
{
|
|
903
926
|
prepareState,
|
|
@@ -966,8 +989,27 @@ function preparePayloadAttributes(
|
|
|
966
989
|
}
|
|
967
990
|
|
|
968
991
|
if (ForkSeq[fork] >= ForkSeq.heze) {
|
|
969
|
-
//
|
|
970
|
-
|
|
992
|
+
// Built from the full view including untimely lists (only_timely=False in prepare_execution_payload),
|
|
993
|
+
// a superset of the timely-only set every validator enforces
|
|
994
|
+
const parentBlockRootHex = toRootHex(parentBlockRoot);
|
|
995
|
+
const parentBlock = chain.forkChoice.getBlockHexAndBlockHash(parentBlockRootHex, toRootHex(parentBlockHash));
|
|
996
|
+
if (parentBlock === null) {
|
|
997
|
+
throw new Error(
|
|
998
|
+
`Parent block not in fork choice for Heze payload attributes parentBlockRoot=${parentBlockRootHex} parentBlockHash=${toRootHex(parentBlockHash)}`
|
|
999
|
+
);
|
|
1000
|
+
}
|
|
1001
|
+
const inclusionListSlot = prepareSlot - 1;
|
|
1002
|
+
(payloadAttributes as heze.SSEPayloadAttributes["payloadAttributes"]).inclusionListTransactions =
|
|
1003
|
+
chain.inclusionListStore.getInclusionListTransactions(
|
|
1004
|
+
inclusionListSlot,
|
|
1005
|
+
getShufflingDependentRoot(
|
|
1006
|
+
chain.forkChoice,
|
|
1007
|
+
computeEpochAtSlot(inclusionListSlot),
|
|
1008
|
+
computeEpochAtSlot(parentBlock.slot),
|
|
1009
|
+
parentBlock
|
|
1010
|
+
),
|
|
1011
|
+
false
|
|
1012
|
+
);
|
|
971
1013
|
}
|
|
972
1014
|
|
|
973
1015
|
return payloadAttributes;
|
|
@@ -1106,16 +1148,21 @@ export async function produceCommonBlockBody<T extends BlockType>(
|
|
|
1106
1148
|
});
|
|
1107
1149
|
|
|
1108
1150
|
// Live proposal production is supported from Fulu onward.
|
|
1109
|
-
|
|
1151
|
+
const commonBlockBody: CommonBlockBody = {
|
|
1110
1152
|
randaoReveal,
|
|
1111
1153
|
graffiti,
|
|
1112
|
-
eth1Data: currentState.eth1Data,
|
|
1113
1154
|
proposerSlashings: this.opts.disableProposerSlashings === true ? [] : proposerSlashings,
|
|
1114
1155
|
attesterSlashings,
|
|
1115
1156
|
attestations,
|
|
1116
|
-
deposits: [],
|
|
1117
1157
|
voluntaryExits,
|
|
1118
1158
|
blsToExecutionChanges,
|
|
1119
1159
|
syncAggregate,
|
|
1120
1160
|
};
|
|
1161
|
+
|
|
1162
|
+
if (!isForkPostHeze(fork)) {
|
|
1163
|
+
commonBlockBody.eth1Data = currentState.eth1Data;
|
|
1164
|
+
commonBlockBody.deposits = [];
|
|
1165
|
+
}
|
|
1166
|
+
|
|
1167
|
+
return commonBlockBody;
|
|
1121
1168
|
}
|
|
@@ -24,6 +24,7 @@ export enum RegenCaller {
|
|
|
24
24
|
validateApiVoluntaryExit = "validateApiVoluntaryExit",
|
|
25
25
|
publishDeferredVoluntaryExits = "publishDeferredVoluntaryExits",
|
|
26
26
|
validateGossipExecutionPayloadBid = "validateGossipExecutionPayloadBid",
|
|
27
|
+
validateGossipInclusionList = "validateGossipInclusionList",
|
|
27
28
|
validateApiExecutionPayloadBid = "validateApiExecutionPayloadBid",
|
|
28
29
|
validateGossipPayloadAttestationMessage = "validateGossipPayloadAttestationMessage",
|
|
29
30
|
validateGossipProposerPreferences = "validateGossipProposerPreferences",
|
package/src/chain/reprocess.ts
CHANGED
|
@@ -5,8 +5,9 @@ import {Metrics} from "../metrics/index.js";
|
|
|
5
5
|
/**
|
|
6
6
|
* To prevent our node from having to reprocess while struggling to sync,
|
|
7
7
|
* we only want to reprocess attestations if block reaches our node before this time.
|
|
8
|
+
* Expressed in basis points of slot duration (1667 BPS = 2s for 12s slots).
|
|
8
9
|
*/
|
|
9
|
-
export const
|
|
10
|
+
export const REPROCESS_MIN_TIME_TO_NEXT_SLOT_BPS = 1667;
|
|
10
11
|
|
|
11
12
|
/**
|
|
12
13
|
* Reprocess status for metrics
|
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
ForkName,
|
|
5
5
|
ForkPostFulu,
|
|
6
6
|
ForkPostGloas,
|
|
7
|
+
ForkPreDeneb,
|
|
7
8
|
ForkPreGloas,
|
|
8
9
|
SLOTS_PER_EPOCH,
|
|
9
10
|
isForkPostDeneb,
|
|
@@ -240,7 +241,7 @@ export class SeenBlockInput {
|
|
|
240
241
|
} else if (!isForkPostDeneb(forkName)) {
|
|
241
242
|
// Pre-deneb
|
|
242
243
|
blockInput = BlockInputPreData.createFromBlock({
|
|
243
|
-
block
|
|
244
|
+
block: block as SignedBeaconBlock<ForkPreDeneb>,
|
|
244
245
|
blockRootHex,
|
|
245
246
|
daOutOfRange,
|
|
246
247
|
forkName,
|
|
@@ -592,7 +592,10 @@ export class PersistentCheckpointStateCache implements CheckpointStateCache {
|
|
|
592
592
|
}
|
|
593
593
|
|
|
594
594
|
const blockSlot = state.slot;
|
|
595
|
-
const processCPStatesTimeMs = this.config.getSlotComponentDurationMs(
|
|
595
|
+
const processCPStatesTimeMs = this.config.getSlotComponentDurationMs(
|
|
596
|
+
this.config.getForkName(blockSlot),
|
|
597
|
+
PROCESS_CHECKPOINT_STATES_BPS
|
|
598
|
+
);
|
|
596
599
|
// we always have clock in production, fallback value is only for test
|
|
597
600
|
const msFromSlot = this.clock?.msFromSlot(blockSlot) ?? processCPStatesTimeMs;
|
|
598
601
|
const msToProcessCPStates = processCPStatesTimeMs - msFromSlot;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import {ProtoBlock} from "@lodestar/fork-choice";
|
|
2
|
-
import {PAYLOAD_BUILDER_VERSION} from "@lodestar/params";
|
|
2
|
+
import {PAYLOAD_BUILDER_VERSION, isForkPostHeze} from "@lodestar/params";
|
|
3
3
|
import {
|
|
4
4
|
computeEpochAtSlot,
|
|
5
5
|
createSingleSignatureSetFromComponents,
|
|
@@ -9,7 +9,7 @@ import {
|
|
|
9
9
|
isStartSlotOfEpoch,
|
|
10
10
|
isStatePostGloas,
|
|
11
11
|
} from "@lodestar/state-transition";
|
|
12
|
-
import {RootHex, Slot, ValidatorIndex, gloas} from "@lodestar/types";
|
|
12
|
+
import {RootHex, Slot, ValidatorIndex, gloas, heze} from "@lodestar/types";
|
|
13
13
|
import {byteArrayEquals, toHex, toRootHex} from "@lodestar/utils";
|
|
14
14
|
import {getShufflingDependentRoot} from "../../util/dependentRoot.js";
|
|
15
15
|
import {ExecutionPayloadBidError, ExecutionPayloadBidErrorCode, GossipAction} from "../errors/index.js";
|
|
@@ -147,6 +147,18 @@ export async function validateApiExecutionPayloadBid(
|
|
|
147
147
|
});
|
|
148
148
|
}
|
|
149
149
|
|
|
150
|
+
// [IGNORE] The bid is received after the inclusion list deadline of `bid.slot - 1`
|
|
151
|
+
if (
|
|
152
|
+
isForkPostHeze(chain.config.getForkName(bid.slot)) &&
|
|
153
|
+
chain.clock.msFromSlot(bid.slot - 1) < chain.config.getInclusionListDueMs(chain.config.getForkName(bid.slot - 1))
|
|
154
|
+
) {
|
|
155
|
+
throw new ExecutionPayloadBidError(GossipAction.IGNORE, {
|
|
156
|
+
code: ExecutionPayloadBidErrorCode.BEFORE_INCLUSION_LIST_DEADLINE,
|
|
157
|
+
builderIndex: bid.builderIndex,
|
|
158
|
+
slot: bid.slot,
|
|
159
|
+
});
|
|
160
|
+
}
|
|
161
|
+
|
|
150
162
|
// [IGNORE] `bid.parent_block_root` is the hash tree root of a known beacon block in fork choice.
|
|
151
163
|
// Moved earlier than the spec ordering so we can derive the proposer dependent root for the
|
|
152
164
|
// proposer-preferences lookup below from a known fork-choice block.
|
|
@@ -309,6 +321,18 @@ async function validateExecutionPayloadBid(
|
|
|
309
321
|
});
|
|
310
322
|
}
|
|
311
323
|
|
|
324
|
+
// [IGNORE] The bid is received after the inclusion list deadline of `bid.slot - 1`
|
|
325
|
+
if (
|
|
326
|
+
isForkPostHeze(chain.config.getForkName(bid.slot)) &&
|
|
327
|
+
chain.clock.msFromSlot(bid.slot - 1) < chain.config.getInclusionListDueMs(chain.config.getForkName(bid.slot - 1))
|
|
328
|
+
) {
|
|
329
|
+
throw new ExecutionPayloadBidError(GossipAction.IGNORE, {
|
|
330
|
+
code: ExecutionPayloadBidErrorCode.BEFORE_INCLUSION_LIST_DEADLINE,
|
|
331
|
+
builderIndex: bid.builderIndex,
|
|
332
|
+
slot: bid.slot,
|
|
333
|
+
});
|
|
334
|
+
}
|
|
335
|
+
|
|
312
336
|
// [IGNORE] The bid is compatible with the current head branch.
|
|
313
337
|
const head = chain.forkChoice.getHead();
|
|
314
338
|
if (!isBidCompatibleWithHead(chain, head, bid.slot, bidParentBlockRoot, bidParentBlockHash)) {
|
|
@@ -357,6 +381,32 @@ async function validateExecutionPayloadBid(
|
|
|
357
381
|
});
|
|
358
382
|
}
|
|
359
383
|
|
|
384
|
+
// [IGNORE] bid.inclusionListBits is inclusive of our timely inclusion lists for
|
|
385
|
+
// (bid.slot - 1, get_shuffling_dependent_root(store, bid.parent_block_root, epoch)).
|
|
386
|
+
if (isForkPostHeze(chain.config.getForkName(bid.slot))) {
|
|
387
|
+
const {inclusionListBits} = bid as heze.ExecutionPayloadBid;
|
|
388
|
+
const inclusionListSlot = bid.slot - 1;
|
|
389
|
+
const inclusionListDependentRoot = getShufflingDependentRoot(
|
|
390
|
+
chain.forkChoice,
|
|
391
|
+
computeEpochAtSlot(inclusionListSlot),
|
|
392
|
+
computeEpochAtSlot(parentBlock.slot),
|
|
393
|
+
parentBlock
|
|
394
|
+
);
|
|
395
|
+
if (
|
|
396
|
+
!chain.inclusionListStore.isInclusionListBitsInclusive(
|
|
397
|
+
inclusionListSlot,
|
|
398
|
+
inclusionListDependentRoot,
|
|
399
|
+
inclusionListBits
|
|
400
|
+
)
|
|
401
|
+
) {
|
|
402
|
+
throw new ExecutionPayloadBidError(GossipAction.IGNORE, {
|
|
403
|
+
code: ExecutionPayloadBidErrorCode.INCLUSION_LIST_BITS_NOT_INCLUSIVE,
|
|
404
|
+
builderIndex: bid.builderIndex,
|
|
405
|
+
slot: bid.slot,
|
|
406
|
+
});
|
|
407
|
+
}
|
|
408
|
+
}
|
|
409
|
+
|
|
360
410
|
// [IGNORE] A `SignedProposerPreferences` matching `bid.slot` and the bid's branch has been
|
|
361
411
|
// seen — i.e. `proposal_slot == bid.slot` AND `dependent_root ==
|
|
362
412
|
// get_proposer_dependent_root(parent_state, compute_epoch_at_slot(bid.slot))`.
|