@lodestar/beacon-node 1.50.0 → 1.51.0-dev.02c5a19f35
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 +50 -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 -15
- 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 +150 -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/blobVersionedHashes.d.ts +1 -1
- package/lib/execution/engine/blobVersionedHashes.d.ts.map +1 -1
- package/lib/execution/engine/blobVersionedHashes.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 +27 -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 +31 -7
- package/lib/execution/engine/mock.js.map +1 -1
- package/lib/execution/engine/payloadIdCache.d.ts +5 -3
- package/lib/execution/engine/payloadIdCache.d.ts.map +1 -1
- package/lib/execution/engine/payloadIdCache.js +15 -4
- 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/sszTypes.d.ts +38 -38
- 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 +25 -1
- package/lib/execution/engine/types.d.ts.map +1 -1
- package/lib/execution/engine/types.js +29 -15
- 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 +13 -19
- 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 +63 -17
- 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 +45 -20
- 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 +30 -30
- 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 +68 -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 -24
- 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 +192 -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/blobVersionedHashes.ts +1 -1
- package/src/execution/engine/disabled.ts +4 -0
- package/src/execution/engine/http.ts +40 -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 +32 -7
- package/src/execution/engine/payloadIdCache.ts +24 -6
- 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 +53 -16
- 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 +80 -20
- 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 +50 -30
- package/src/util/clock.ts +3 -4
- package/src/util/sszBytes.ts +25 -12
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { BitArray } from "@chainsafe/ssz";
|
|
2
|
+
import { BeaconConfig } from "@lodestar/config";
|
|
3
|
+
import { RootHex, Slot, ValidatorIndex, bellatrix, heze } from "@lodestar/types";
|
|
4
|
+
export declare enum InclusionListInsertOutcome {
|
|
5
|
+
/** Stored as a new entry. */
|
|
6
|
+
New = "New",
|
|
7
|
+
/** Slot is older than the prune horizon. */
|
|
8
|
+
Old = "Old",
|
|
9
|
+
/** Identical inclusion list already stored. */
|
|
10
|
+
Seen = "Seen",
|
|
11
|
+
/** New equivocation evidence: this validator already has a different inclusion list stored. */
|
|
12
|
+
Equivocating = "Equivocating",
|
|
13
|
+
/** Validator was already marked as an equivocator for this `(slot, dependent_root)`. */
|
|
14
|
+
SubsequentEquivocation = "SubsequentEquivocation"
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* Spec `InclusionListStore`: inclusion lists keyed by `(slot, dependent_root)`, one per validator index.
|
|
18
|
+
* The committee position is recorded at insert time (gossip validation resolves it) so the bit-oriented
|
|
19
|
+
* reads need no shuffling lookup. Signed lists are kept so InclusionListsByIndices can serve them.
|
|
20
|
+
* A validator's first list stays stored and an equivocation marks the validator so reads skip it.
|
|
21
|
+
*/
|
|
22
|
+
export declare class InclusionListStore {
|
|
23
|
+
private readonly config;
|
|
24
|
+
/** slot -> dependent_root -> validator index -> entry */
|
|
25
|
+
private readonly inclusionLists;
|
|
26
|
+
/** slot -> dependent_root -> equivocating validator indices */
|
|
27
|
+
private readonly equivocators;
|
|
28
|
+
/** slot -> dependent_root -> validator index -> count, for the p2p "first or second message" rule */
|
|
29
|
+
private readonly seenCounts;
|
|
30
|
+
private lowestPermissibleSlot;
|
|
31
|
+
constructor(config: BeaconConfig);
|
|
32
|
+
get size(): number;
|
|
33
|
+
/**
|
|
34
|
+
* Late lists are stored with `timely=false` rather than dropped: they still count toward the
|
|
35
|
+
* non-timely view used to validate another node's `inclusion_list_bits`.
|
|
36
|
+
*/
|
|
37
|
+
process(signedInclusionList: heze.SignedInclusionList, committeeIndices: number[], timely: boolean): InclusionListInsertOutcome;
|
|
38
|
+
/** Count a valid message of `validatorIndex` for the first-or-second message gossip rule */
|
|
39
|
+
markSeen(slot: Slot, dependentRoot: RootHex, validatorIndex: ValidatorIndex): void;
|
|
40
|
+
/** Gossip rule: at most two valid messages per validator for a `(slot, dependent_root)` */
|
|
41
|
+
seenTwice(slot: Slot, dependentRoot: RootHex, validatorIndex: ValidatorIndex): boolean;
|
|
42
|
+
/** Deduplicated transactions from valid, non-equivocating inclusion lists at `(slot, dependentRoot)`. */
|
|
43
|
+
getInclusionListTransactions(slot: Slot, dependentRoot: RootHex, onlyTimely?: boolean): bellatrix.Transactions;
|
|
44
|
+
/** Bit `i` is set when committee member `i` submitted a valid, non-equivocating inclusion list */
|
|
45
|
+
getInclusionListBits(slot: Slot, dependentRoot: RootHex, onlyTimely?: boolean): BitArray;
|
|
46
|
+
/**
|
|
47
|
+
* True if `bits` has a bit set for every bit set in the local inclusion list bits.
|
|
48
|
+
*
|
|
49
|
+
* Intentionally deviates from the spec by only checking against timely lists, where the proposer would check
|
|
50
|
+
* against every list it observed (only_timely=False in
|
|
51
|
+
* https://github.com/ethereum/consensus-specs/blob/v1.7.0-beta.4/specs/heze/validator.md#signed-execution-payload-bid).
|
|
52
|
+
* A bid that passed gossip must stay eligible, otherwise a list released after the deadline voids every bid and
|
|
53
|
+
* a high early bid with empty bits crowds out the rest without ever paying.
|
|
54
|
+
*/
|
|
55
|
+
isInclusionListBitsInclusive(slot: Slot, dependentRoot: RootHex, bits: BitArray): boolean;
|
|
56
|
+
/** Inclusion lists for the given committee positions, to serve InclusionListsByIndices. */
|
|
57
|
+
getByIndices(slot: Slot, dependentRoot: RootHex, indices: BitArray): heze.SignedInclusionList[];
|
|
58
|
+
/** Lists are retained for MIN_SLOTS_FOR_INCLUSION_LISTS_REQUESTS slots so InclusionListsByIndices can serve them */
|
|
59
|
+
prune(clockSlot: Slot): void;
|
|
60
|
+
/** Entries at `(slot, dependentRoot)` from non-equivocating validators, timely when required. */
|
|
61
|
+
private getEligible;
|
|
62
|
+
}
|
|
63
|
+
//# sourceMappingURL=inclusionListStore.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"inclusionListStore.d.ts","sourceRoot":"","sources":["../../../src/chain/opPools/inclusionListStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAiB,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAC,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,IAAI,EAAM,MAAM,iBAAiB,CAAC;AAGpF,oBAAY,0BAA0B;IACpC,6BAA6B;IAC7B,GAAG,QAAQ;IACX,4CAA4C;IAC5C,GAAG,QAAQ;IACX,+CAA+C;IAC/C,IAAI,SAAS;IACb,+FAA+F;IAC/F,YAAY,iBAAiB;IAC7B,wFAAwF;IACxF,sBAAsB,2BAA2B;CAClD;AAUD;;;;;GAKG;AACH,qBAAa,kBAAkB;IAgBjB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAfnC,yDAAyD;IACzD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAE7B;IACF,+DAA+D;IAC/D,OAAO,CAAC,QAAQ,CAAC,YAAY,CAE3B;IACF,qGAAqG;IACrG,OAAO,CAAC,QAAQ,CAAC,UAAU,CAEzB;IAEF,OAAO,CAAC,qBAAqB,CAAK;IAElC,YAA6B,MAAM,EAAE,YAAY,EAAI;IAErD,IAAI,IAAI,IAAI,MAAM,CAQjB;IAED;;;OAGG;IACH,OAAO,CACL,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,EAC7C,gBAAgB,EAAE,MAAM,EAAE,EAC1B,MAAM,EAAE,OAAO,GACd,0BAA0B,CA0B5B;IAED,4FAA4F;IAC5F,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,cAAc,EAAE,cAAc,GAAG,IAAI,CAGjF;IAED,2FAA2F;IAC3F,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAErF;IAED,yGAAyG;IACzG,4BAA4B,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,UAAO,GAAG,SAAS,CAAC,YAAY,CAe1G;IAED,kGAAkG;IAClG,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,UAAO,GAAG,QAAQ,CAQpF;IAED;;;;;;;;OAQG;IACH,4BAA4B,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,GAAG,OAAO,CAOxF;IAED,2FAA2F;IAC3F,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAQ9F;IAED,oHAAoH;IACpH,KAAK,CAAC,SAAS,EAAE,IAAI,GAAG,IAAI,CAoB3B;IAED,iGAAiG;IACjG,OAAO,CAAE,WAAW;CAiBrB"}
|
|
@@ -0,0 +1,171 @@
|
|
|
1
|
+
import { BitArray, SerializedList } from "@chainsafe/ssz";
|
|
2
|
+
import { INCLUSION_LIST_COMMITTEE_SIZE } from "@lodestar/params";
|
|
3
|
+
import { ssz } from "@lodestar/types";
|
|
4
|
+
import { MapDef, toHex, toRootHex } from "@lodestar/utils";
|
|
5
|
+
export var InclusionListInsertOutcome;
|
|
6
|
+
(function (InclusionListInsertOutcome) {
|
|
7
|
+
/** Stored as a new entry. */
|
|
8
|
+
InclusionListInsertOutcome["New"] = "New";
|
|
9
|
+
/** Slot is older than the prune horizon. */
|
|
10
|
+
InclusionListInsertOutcome["Old"] = "Old";
|
|
11
|
+
/** Identical inclusion list already stored. */
|
|
12
|
+
InclusionListInsertOutcome["Seen"] = "Seen";
|
|
13
|
+
/** New equivocation evidence: this validator already has a different inclusion list stored. */
|
|
14
|
+
InclusionListInsertOutcome["Equivocating"] = "Equivocating";
|
|
15
|
+
/** Validator was already marked as an equivocator for this `(slot, dependent_root)`. */
|
|
16
|
+
InclusionListInsertOutcome["SubsequentEquivocation"] = "SubsequentEquivocation";
|
|
17
|
+
})(InclusionListInsertOutcome || (InclusionListInsertOutcome = {}));
|
|
18
|
+
/**
|
|
19
|
+
* Spec `InclusionListStore`: inclusion lists keyed by `(slot, dependent_root)`, one per validator index.
|
|
20
|
+
* The committee position is recorded at insert time (gossip validation resolves it) so the bit-oriented
|
|
21
|
+
* reads need no shuffling lookup. Signed lists are kept so InclusionListsByIndices can serve them.
|
|
22
|
+
* A validator's first list stays stored and an equivocation marks the validator so reads skip it.
|
|
23
|
+
*/
|
|
24
|
+
export class InclusionListStore {
|
|
25
|
+
config;
|
|
26
|
+
/** slot -> dependent_root -> validator index -> entry */
|
|
27
|
+
inclusionLists = new MapDef(() => new MapDef(() => new Map()));
|
|
28
|
+
/** slot -> dependent_root -> equivocating validator indices */
|
|
29
|
+
equivocators = new MapDef(() => new MapDef(() => new Set()));
|
|
30
|
+
/** slot -> dependent_root -> validator index -> count, for the p2p "first or second message" rule */
|
|
31
|
+
seenCounts = new MapDef(() => new MapDef(() => new Map()));
|
|
32
|
+
lowestPermissibleSlot = 0;
|
|
33
|
+
constructor(config) {
|
|
34
|
+
this.config = config;
|
|
35
|
+
}
|
|
36
|
+
get size() {
|
|
37
|
+
let count = 0;
|
|
38
|
+
for (const byDependentRoot of this.inclusionLists.values()) {
|
|
39
|
+
for (const entries of byDependentRoot.values()) {
|
|
40
|
+
count += entries.size;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
return count;
|
|
44
|
+
}
|
|
45
|
+
/**
|
|
46
|
+
* Late lists are stored with `timely=false` rather than dropped: they still count toward the
|
|
47
|
+
* non-timely view used to validate another node's `inclusion_list_bits`.
|
|
48
|
+
*/
|
|
49
|
+
process(signedInclusionList, committeeIndices, timely) {
|
|
50
|
+
const inclusionList = signedInclusionList.message;
|
|
51
|
+
const { slot, validatorIndex } = inclusionList;
|
|
52
|
+
if (slot < this.lowestPermissibleSlot) {
|
|
53
|
+
return InclusionListInsertOutcome.Old;
|
|
54
|
+
}
|
|
55
|
+
const dependentRoot = toRootHex(inclusionList.dependentRoot);
|
|
56
|
+
const stored = this.inclusionLists.getOrDefault(slot).getOrDefault(dependentRoot);
|
|
57
|
+
const entry = stored.get(validatorIndex);
|
|
58
|
+
if (entry !== undefined) {
|
|
59
|
+
if (ssz.heze.InclusionList.equals(entry.signedInclusionList.message, inclusionList)) {
|
|
60
|
+
return InclusionListInsertOutcome.Seen;
|
|
61
|
+
}
|
|
62
|
+
const equivocators = this.equivocators.getOrDefault(slot).getOrDefault(dependentRoot);
|
|
63
|
+
if (equivocators.has(validatorIndex)) {
|
|
64
|
+
return InclusionListInsertOutcome.SubsequentEquivocation;
|
|
65
|
+
}
|
|
66
|
+
equivocators.add(validatorIndex);
|
|
67
|
+
return InclusionListInsertOutcome.Equivocating;
|
|
68
|
+
}
|
|
69
|
+
stored.set(validatorIndex, { signedInclusionList, committeeIndices, timely });
|
|
70
|
+
return InclusionListInsertOutcome.New;
|
|
71
|
+
}
|
|
72
|
+
/** Count a valid message of `validatorIndex` for the first-or-second message gossip rule */
|
|
73
|
+
markSeen(slot, dependentRoot, validatorIndex) {
|
|
74
|
+
const counts = this.seenCounts.getOrDefault(slot).getOrDefault(dependentRoot);
|
|
75
|
+
counts.set(validatorIndex, (counts.get(validatorIndex) ?? 0) + 1);
|
|
76
|
+
}
|
|
77
|
+
/** Gossip rule: at most two valid messages per validator for a `(slot, dependent_root)` */
|
|
78
|
+
seenTwice(slot, dependentRoot, validatorIndex) {
|
|
79
|
+
return (this.seenCounts.get(slot)?.get(dependentRoot)?.get(validatorIndex) ?? 0) >= 2;
|
|
80
|
+
}
|
|
81
|
+
/** Deduplicated transactions from valid, non-equivocating inclusion lists at `(slot, dependentRoot)`. */
|
|
82
|
+
getInclusionListTransactions(slot, dependentRoot, onlyTimely = true) {
|
|
83
|
+
const transactions = [];
|
|
84
|
+
const seen = new Set();
|
|
85
|
+
for (const { signedInclusionList } of this.getEligible(slot, dependentRoot, onlyTimely)) {
|
|
86
|
+
for (const transaction of signedInclusionList.message.transactions) {
|
|
87
|
+
const key = toHex(transaction);
|
|
88
|
+
if (!seen.has(key)) {
|
|
89
|
+
seen.add(key);
|
|
90
|
+
transactions.push(transaction);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
return SerializedList.fromArray(transactions);
|
|
95
|
+
}
|
|
96
|
+
/** Bit `i` is set when committee member `i` submitted a valid, non-equivocating inclusion list */
|
|
97
|
+
getInclusionListBits(slot, dependentRoot, onlyTimely = true) {
|
|
98
|
+
const bits = BitArray.fromBitLen(INCLUSION_LIST_COMMITTEE_SIZE);
|
|
99
|
+
for (const { committeeIndices } of this.getEligible(slot, dependentRoot, onlyTimely)) {
|
|
100
|
+
for (const committeeIndex of committeeIndices) {
|
|
101
|
+
bits.set(committeeIndex, true);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
return bits;
|
|
105
|
+
}
|
|
106
|
+
/**
|
|
107
|
+
* True if `bits` has a bit set for every bit set in the local inclusion list bits.
|
|
108
|
+
*
|
|
109
|
+
* Intentionally deviates from the spec by only checking against timely lists, where the proposer would check
|
|
110
|
+
* against every list it observed (only_timely=False in
|
|
111
|
+
* https://github.com/ethereum/consensus-specs/blob/v1.7.0-beta.4/specs/heze/validator.md#signed-execution-payload-bid).
|
|
112
|
+
* A bid that passed gossip must stay eligible, otherwise a list released after the deadline voids every bid and
|
|
113
|
+
* a high early bid with empty bits crowds out the rest without ever paying.
|
|
114
|
+
*/
|
|
115
|
+
isInclusionListBitsInclusive(slot, dependentRoot, bits) {
|
|
116
|
+
for (const { committeeIndices } of this.getEligible(slot, dependentRoot, true)) {
|
|
117
|
+
if (committeeIndices.some((committeeIndex) => !bits.get(committeeIndex))) {
|
|
118
|
+
return false;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
return true;
|
|
122
|
+
}
|
|
123
|
+
/** Inclusion lists for the given committee positions, to serve InclusionListsByIndices. */
|
|
124
|
+
getByIndices(slot, dependentRoot, indices) {
|
|
125
|
+
const out = [];
|
|
126
|
+
for (const { signedInclusionList, committeeIndices } of this.getEligible(slot, dependentRoot, false)) {
|
|
127
|
+
if (committeeIndices.some((committeeIndex) => indices.get(committeeIndex))) {
|
|
128
|
+
out.push(signedInclusionList);
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
return out;
|
|
132
|
+
}
|
|
133
|
+
/** Lists are retained for MIN_SLOTS_FOR_INCLUSION_LISTS_REQUESTS slots so InclusionListsByIndices can serve them */
|
|
134
|
+
prune(clockSlot) {
|
|
135
|
+
const horizon = clockSlot - this.config.MIN_SLOTS_FOR_INCLUSION_LISTS_REQUESTS;
|
|
136
|
+
for (const slot of this.inclusionLists.keys()) {
|
|
137
|
+
if (slot < horizon) {
|
|
138
|
+
this.inclusionLists.delete(slot);
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
for (const slot of this.equivocators.keys()) {
|
|
142
|
+
if (slot < horizon) {
|
|
143
|
+
this.equivocators.delete(slot);
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
for (const slot of this.seenCounts.keys()) {
|
|
147
|
+
if (slot < horizon) {
|
|
148
|
+
this.seenCounts.delete(slot);
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
this.lowestPermissibleSlot = Math.max(horizon, 0);
|
|
152
|
+
}
|
|
153
|
+
/** Entries at `(slot, dependentRoot)` from non-equivocating validators, timely when required. */
|
|
154
|
+
*getEligible(slot, dependentRoot, onlyTimely) {
|
|
155
|
+
const stored = this.inclusionLists.get(slot)?.get(dependentRoot);
|
|
156
|
+
if (!stored || stored.size === 0) {
|
|
157
|
+
return;
|
|
158
|
+
}
|
|
159
|
+
const equivocators = this.equivocators.get(slot)?.get(dependentRoot);
|
|
160
|
+
for (const [validatorIndex, entry] of stored) {
|
|
161
|
+
if (equivocators?.has(validatorIndex)) {
|
|
162
|
+
continue;
|
|
163
|
+
}
|
|
164
|
+
if (onlyTimely && !entry.timely) {
|
|
165
|
+
continue;
|
|
166
|
+
}
|
|
167
|
+
yield entry;
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
//# sourceMappingURL=inclusionListStore.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"inclusionListStore.js","sourceRoot":"","sources":["../../../src/chain/opPools/inclusionListStore.ts"],"names":[],"mappings":"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"}
|
|
@@ -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";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/chain/opPools/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,yBAAyB,EAAC,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAC,yBAAyB,EAAC,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAC,uBAAuB,EAAE,KAAK,yBAAyB,EAAC,MAAM,8BAA8B,CAAC;AACrG,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACnC,OAAO,EAAC,sBAAsB,EAAC,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAC,uBAAuB,EAAC,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAC,wBAAwB,EAAC,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAC,4BAA4B,EAAC,MAAM,mCAAmC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/chain/opPools/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,yBAAyB,EAAC,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAC,yBAAyB,EAAC,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAC,uBAAuB,EAAE,KAAK,yBAAyB,EAAC,MAAM,8BAA8B,CAAC;AACrG,OAAO,EAAC,0BAA0B,EAAE,kBAAkB,EAAC,MAAM,yBAAyB,CAAC;AACvF,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACnC,OAAO,EAAC,sBAAsB,EAAC,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAC,uBAAuB,EAAC,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAC,wBAAwB,EAAC,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAC,4BAA4B,EAAC,MAAM,mCAAmC,CAAC"}
|
|
@@ -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 } 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";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/chain/opPools/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,yBAAyB,EAAC,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAC,yBAAyB,EAAC,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAC,uBAAuB,EAAiC,MAAM,8BAA8B,CAAC;AACrG,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACnC,OAAO,EAAC,sBAAsB,EAAC,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAC,uBAAuB,EAAC,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAC,wBAAwB,EAAC,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAC,4BAA4B,EAAC,MAAM,mCAAmC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/chain/opPools/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,yBAAyB,EAAC,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAC,yBAAyB,EAAC,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAC,uBAAuB,EAAiC,MAAM,8BAA8B,CAAC;AACrG,OAAO,EAAC,0BAA0B,EAAE,kBAAkB,EAAC,MAAM,yBAAyB,CAAC;AACvF,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACnC,OAAO,EAAC,sBAAsB,EAAC,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAC,uBAAuB,EAAC,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAC,wBAAwB,EAAC,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAC,4BAA4B,EAAC,MAAM,mCAAmC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareNextSlot.d.ts","sourceRoot":"","sources":["../../src/chain/prepareNextSlot.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAUjD,OAAO,EAEL,gBAAgB,EASjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAU,IAAI,EAAiB,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAC,MAAM,EAAwC,MAAM,iBAAiB,CAAC;AAI9E,OAAO,EAAC,OAAO,EAAC,MAAM,qBAAqB,CAAC;AAI5C,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAU5C,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAkB1C;;;;;;;;;;GAUG;AACH,qBAAa,wBAAwB;IAEjC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IALzB,YACmB,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,OAAO,GAAG,IAAI,EACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,WAAW,EAUrC;IAED;;OAEG;IACH,kBAAkB,cAAqB,IAAI,KAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"prepareNextSlot.d.ts","sourceRoot":"","sources":["../../src/chain/prepareNextSlot.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAUjD,OAAO,EAEL,gBAAgB,EASjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAU,IAAI,EAAiB,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAC,MAAM,EAAwC,MAAM,iBAAiB,CAAC;AAI9E,OAAO,EAAC,OAAO,EAAC,MAAM,qBAAqB,CAAC;AAI5C,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAU5C,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAkB1C;;;;;;;;;;GAUG;AACH,qBAAa,wBAAwB;IAEjC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IALzB,YACmB,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,OAAO,GAAG,IAAI,EACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,WAAW,EAUrC;IAED;;OAEG;IACH,kBAAkB,cAAqB,IAAI,KAAG,OAAO,CAAC,IAAI,CAAC,CAuUzD;IAEF;;;OAGG;IACH,OAAO,CAAC,4BAA4B;IAepC,wBAAwB,CAAC,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,OAAO,GAAG,IAAI,CAQlF;CACF"}
|
|
@@ -63,6 +63,7 @@ export class PrepareNextSlotScheduler {
|
|
|
63
63
|
const nextEpoch = computeEpochAtSlot(clockSlot) + 1;
|
|
64
64
|
const isEpochTransition = prepareEpoch === nextEpoch;
|
|
65
65
|
const fork = this.config.getForkName(prepareSlot);
|
|
66
|
+
const currentFork = this.config.getForkName(clockSlot);
|
|
66
67
|
// Early return if we are pre-genesis
|
|
67
68
|
// or we are pre-bellatrix and this is not an epoch transition
|
|
68
69
|
if (prepareSlot <= GENESIS_SLOT || (ForkSeq[fork] < ForkSeq.bellatrix && !isEpochTransition)) {
|
|
@@ -71,7 +72,7 @@ export class PrepareNextSlotScheduler {
|
|
|
71
72
|
try {
|
|
72
73
|
// At PREPARE_NEXT_SLOT_BPS (~67%) of the current slot we prepare payload for the next slot
|
|
73
74
|
// or precompute epoch transition
|
|
74
|
-
await sleep(this.config.getSlotComponentDurationMs(PREPARE_NEXT_SLOT_BPS), this.signal);
|
|
75
|
+
await sleep(this.config.getSlotComponentDurationMs(currentFork, PREPARE_NEXT_SLOT_BPS), this.signal);
|
|
75
76
|
// calling updateHead() here before we produce a block to reduce reorg possibility
|
|
76
77
|
const headBlock = this.chain.recomputeForkChoiceHead(ForkchoiceCaller.prepareNextSlot);
|
|
77
78
|
const { slot: headSlot, blockRoot: headRoot } = headBlock;
|
|
@@ -285,7 +286,7 @@ export class PrepareNextSlotScheduler {
|
|
|
285
286
|
clockEpoch < gloasEpoch &&
|
|
286
287
|
// skip when we're the next-slot proposer — don't compete with block-production prep.
|
|
287
288
|
feeRecipient === undefined) {
|
|
288
|
-
const maxDurationMs = this.config.getSlotComponentDurationMs(BUILDER_PREVERIFY_LIMIT_BPS);
|
|
289
|
+
const maxDurationMs = this.config.getSlotComponentDurationMs(currentFork, BUILDER_PREVERIFY_LIMIT_BPS);
|
|
289
290
|
const preVerifyTimer = this.metrics?.builderDepositPreVerify.duration.startTimer();
|
|
290
291
|
const result = headState.preVerifyBuilderDepositsPreGloas(MAX_BUILDER_DEPOSITS_PER_SLOT, maxDurationMs);
|
|
291
292
|
preVerifyTimer?.();
|
|
@@ -337,7 +338,7 @@ export class PrepareNextSlotScheduler {
|
|
|
337
338
|
* later in the slot, connecting at PREPARE_NEXT_SLOT_BPS would go cold before bids are requested.
|
|
338
339
|
*/
|
|
339
340
|
checkBuilderStatusBeforeSlot(prepareSlot) {
|
|
340
|
-
const msBeforeSlot = this.config.getSlotComponentDurationMs(BUILDER_STATUS_CHECK_BEFORE_SLOT_BPS);
|
|
341
|
+
const msBeforeSlot = this.config.getSlotComponentDurationMs(this.config.getForkName(prepareSlot - 1), BUILDER_STATUS_CHECK_BEFORE_SLOT_BPS);
|
|
341
342
|
const msUntilCheck = -this.chain.clock.msFromSlot(prepareSlot) - msBeforeSlot;
|
|
342
343
|
sleep(Math.max(0, msUntilCheck), this.signal)
|
|
343
344
|
.then(() => this.chain.builderApiClient.checkStatus())
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareNextSlot.js","sourceRoot":"","sources":["../../src/chain/prepareNextSlot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,eAAe,CAAC;AAErC,OAAO,EAAC,8BAA8B,EAAE,yBAAyB,EAAC,MAAM,uBAAuB,CAAC;AAChG,OAAO,EAEL,OAAO,EACP,eAAe,EACf,mBAAmB,EACnB,cAAc,EACd,eAAe,GAChB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,6BAA6B,EAG7B,6BAA6B,EAC7B,uBAAuB,EACvB,kBAAkB,EAClB,iBAAiB,EACjB,oBAAoB,EACpB,eAAe,EACf,gBAAgB,GACjB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAS,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,EAAC,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAC,aAAa,EAAC,MAAM,8BAA8B,CAAC;AAG3D,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAC,mBAAmB,EAAC,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC5B,uBAAuB,GACxB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAE7C,sCAAsC;AACtC,6GAA6G;AAC7G,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,CAAC;AAE1C,yDAAyD;AACzD,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAE9B;;mFAEmF;AACnF,MAAM,2BAA2B,GAAG,IAAI,CAAC;AAEzC;;;;;GAKG;AACH,MAAM,oCAAoC,GAAG,IAAI,CAAC;AAElD;;;;;;;;;;GAUG;AACH,MAAM,OAAO,wBAAwB;IAEhB,KAAK;IACL,MAAM;IACN,OAAO;IACP,MAAM;IACN,MAAM;IALzB,YACmB,KAAmB,EACnB,MAAuB,EACvB,OAAuB,EACvB,MAAc,EACd,MAAmB;qBAJnB,KAAK;sBACL,MAAM;uBACN,OAAO;sBACP,MAAM;sBACN,MAAM;QAEvB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC9D,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAC1B,OAAO,EACP,GAAG,EAAE;YACH,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACjE,CAAC,EACD,EAAC,IAAI,EAAE,IAAI,EAAC,CACb,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,kBAAkB,GAAG,KAAK,EAAE,SAAe,EAAiB,EAAE;QAC5D,MAAM,WAAW,GAAG,SAAS,GAAG,CAAC,CAAC;QAClC,MAAM,YAAY,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;QACrD,MAAM,SAAS,GAAG,kBAAkB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACpD,MAAM,iBAAiB,GAAG,YAAY,KAAK,SAAS,CAAC;QACrD,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAElD,qCAAqC;QACrC,+DAA+D;QAC/D,IAAI,WAAW,IAAI,YAAY,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,SAAS,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC;YAC7F,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,2FAA2F;YAC3F,iCAAiC;YACjC,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,qBAAqB,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAExF,kFAAkF;YAClF,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;YACvF,MAAM,EAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAC,GAAG,SAAS,CAAC;YACxD,4DAA4D;YAC5D,IAAI,WAAW,GAAG,SAAS,CAAC;YAE5B,iFAAiF;YACjF,gDAAgD;YAChD,IAAI,WAAW,GAAG,QAAQ,GAAG,mBAAmB,GAAG,eAAe,EAAE,CAAC;gBACnE,IAAI,CAAC,OAAO,EAAE,6BAA6B,CAAC,KAAK,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,MAAM,EAAC,EAAE,CAAC,CAAC,CAAC;gBAC3E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0EAA0E,EAAE;oBAC5F,SAAS;oBACT,QAAQ;oBACR,SAAS;iBACV,CAAC,CAAC;gBAEH,OAAO;YACT,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,4BAA4B,EAAE;gBAChD,SAAS;gBACT,WAAW;gBACX,QAAQ;gBACR,QAAQ;gBACR,iBAAiB;aAClB,CAAC,CAAC;YACH,MAAM,8BAA8B,GAAG,iBAAiB;gBACtD,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,6BAA6B,CAAC,QAAQ,CAAC,UAAU,EAAE;gBACnE,CAAC,CAAC,IAAI,CAAC;YACT,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACzB,IAAI,YAAgC,CAAC;YACrC,8CAA8C;YAC9C,IAAI,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC9B,IAAI,aAA2C,CAAC;gBAEhD,MAAM,gBAAgB,GAAG,KAAK,IAA6B,EAAE;oBAC3D,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;wBACzB,sEAAsE;wBACtE,2EAA2E;wBAC3E,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;oBAClE,CAAC;oBACD,8HAA8H;oBAC9H,0HAA0H;oBAC1H,8FAA8F;oBAC9F,aAAa,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,iBAAiB,CACtD,SAAS,EACT,WAAW,EACX,EAAC,iBAAiB,EAAE,CAAC,iBAAiB,EAAC,EACvC,WAAW,CAAC,eAAe,CAC5B,CAAC;oBACF,OAAO,aAAa,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;gBACtD,CAAC,CAAC;gBAEF,MAAM,aAAa,GAAG,MAAM,gBAAgB,EAAE,CAAC;gBAC/C,IAAI,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;oBACtD,MAAM,iBAAiB,GAAG,eAAe,CAAC,IAAI,CAAC;wBAC7C,CAAC,CAAC,4BAA4B,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,EAAE,QAAQ,CAAC;wBACjE,CAAC,CAAC,IAAI,CAAC;oBACT,YAAY;wBACV,iBAAiB,KAAK,IAAI;4BACxB,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,YAAY,CAAC;4BACvC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;gBACnE,CAAC;gBAED,0DAA0D;gBAC1D,2EAA2E;gBAC3E,+EAA+E;gBAC/E,uFAAuF;gBACvF,wFAAwF;gBACxF,IAAI,YAAY,IAAI,iBAAiB,EAAE,CAAC;oBACtC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC;oBACtD,MAAM,EAAC,IAAI,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,EAAC,GAAG,YAAY,CAAC;oBAE3E,6FAA6F;oBAC7F,IAAI,gBAAgB,KAAK,QAAQ,IAAI,gBAAgB,KAAK,QAAQ,EAAE,CAAC;wBACnE,+EAA+E;wBAC/E,+EAA+E;wBAC/E,MAAM,UAAU,GAAG,YAAY;4BAC7B,CAAC,CAAC,0DAA0D;4BAC5D,CAAC,CAAC,wEAAwE,CAAC;wBAC7E,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE;4BAC9B,gBAAgB;4BAChB,gBAAgB;4BAChB,QAAQ;4BACR,QAAQ;4BACR,iBAAiB;yBAClB,CAAC,CAAC;wBACH,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,GAAG,EAAE,CAAC;wBACrC,IAAI,iBAAiB,EAAE,CAAC;4BACtB,IAAI,CAAC,OAAO,EAAE,6BAA6B,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC;wBACnE,CAAC;wBACD,WAAW,GAAG,YAAY,CAAC;oBAC7B,CAAC;gBACH,CAAC;gBAED,IAAI,YAAY,EAAE,CAAC;oBACjB,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC1B,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;wBAChE,IAAI,CAAC,4BAA4B,CAAC,WAAW,CAAC,CAAC;oBACjD,CAAC;yBAAM,CAAC;wBACN,0EAA0E;wBAC1E,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;wBAC1C,IAAI,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,MAAM,KAAK,aAAa,CAAC,OAAO,EAAE,CAAC;4BAClE,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gCACpD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iDAAiD,EAAE,EAAC,WAAW,EAAC,EAAE,CAAU,CAAC,CAAC;4BAClG,CAAC,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,uEAAuE;gBACvE,8DAA8D;gBAC9D,IAAI,aAAa,KAAK,SAAS,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;oBAC7D,aAAa,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,iBAAiB,CACtD,WAAW,EACX,WAAW;oBACX,2HAA2H;oBAC3H,EAAC,iBAAiB,EAAE,CAAC,iBAAiB,EAAC,EACvC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC,WAAW,CAAC,mBAAmB,CAC1F,CAAC;gBACJ,CAAC;gBAED,IAAI,CAAC,oBAAoB,CAAC,aAAa,CAAC,EAAE,CAAC;oBACzC,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;gBACrE,CAAC;gBAED,IAAI,eAAwB,CAAC;gBAC7B,8EAA8E;gBAC9E,IAAI,uBAAuB,GAA8B,aAAa,CAAC;gBACvE,IAAI,gBAAgB,CAAC,aAAa,CAAC,EAAE,CAAC;oBACpC,uFAAuF;oBACvF,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,iBAAiB,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,CAAC;wBACtE,eAAe,GAAG,aAAa,CAAC,yBAAyB,CAAC,SAAS,CAAC;wBACpE,8GAA8G;wBAC9G,IAAI,YAAY,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,qBAAqB,KAAK,IAAI,EAAE,CAAC;4BACjF,MAAM,uBAAuB,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,0BAA0B,CACzE,WAAW,CAAC,IAAI,EAChB,WAAW,CAAC,SAAS,CACtB,CAAC;4BACF,uBAAuB,GAAG,aAAa,CAAC,wBAAwB,CAAC,uBAAuB,CAAC,CAAC;wBAC5F,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACN,eAAe,GAAG,aAAa,CAAC,yBAAyB,CAAC,eAAe,CAAC;oBAC5E,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,eAAe,GAAG,aAAa,CAAC,4BAA4B,CAAC,SAAS,CAAC;gBACzE,CAAC;gBAED,4EAA4E;gBAC5E,MAAM,aAAa,GAAG,yBAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;gBACpF,MAAM,kBAAkB,GAAG,8BAA8B,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBAEjF,IAAI,iBAAgD,CAAC;gBACrD,0EAA0E;gBAC1E,0FAA0F;gBAC1F,IACE,CAAC,YAAY,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,qBAAqB,KAAK,IAAI,CAAC;oBAChE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,EAC3E,CAAC;oBACD,MAAM,IAAI,GAAG,0BAA0B,CAAC,IAAyB,EAAE,IAAI,CAAC,KAAK,EAAE;wBAC7E,YAAY,EAAE,uBAAuB;wBACrC,WAAW;wBACX,eAAe,EAAE,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC;wBAC/C,eAAe;wBACf,aAAa;wBACb,kBAAkB;wBAClB,YAAY,EAAE,YAAY,IAAI,4CAA4C;qBAC3E,CAAC,CAAC;oBACH,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,EAAE,EAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC,CAAC;oBAC1F,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC;gBAC7C,CAAC;gBAED,IAAI,YAAY,EAAE,CAAC;oBACjB,MAAM,eAAe,GACnB,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;oBAC1F,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;oBAE3E,iFAAiF;oBACjF,kFAAkF;oBAClF,0BAA0B;oBAC1B,MAAM,uBAAuB,CAC3B,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,MAAM,EACX,IAAyB,EAAE,6BAA6B;oBACxD,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,EAC9B,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,uBAAuB,EACvB,YAAY,EACZ,iBAAiB,CAClB,CAAC;oBACF,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,+CAA+C,EAAE;wBACnE,WAAW;wBACX,aAAa;wBACb,YAAY;qBACb,CAAC,CAAC;gBACL,CAAC;gBAED,IAAI,CAAC,wBAAwB,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;YAClE,CAAC;iBAAM,CAAC;gBACN,4FAA4F;gBAC5F,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,iBAAiB,CAC5D,SAAS,EACT,WAAW,EACX,EAAC,iBAAiB,EAAE,CAAC,iBAAiB,EAAC,EACvC,WAAW,CAAC,eAAe,CAC5B,CAAC;gBACF,IAAI,CAAC,wBAAwB,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;YAClE,CAAC;YAED,0HAA0H;YAC1H,2EAA2E;YAC3E,+GAA+G;YAC/G,IAAI,iBAAiB,EAAE,CAAC;gBACtB,IAAI,CAAC,OAAO,EAAE,6BAA6B,CAAC,KAAK,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,SAAS,EAAC,EAAE,CAAC,CAAC,CAAC;gBAC9E,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,2BAA2B,CAAC,WAAW,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;gBACpG,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;oBACvB,IAAI,CAAC,OAAO,EAAE,6BAA6B,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;gBAC1D,CAAC;gBACD,IAAI,CAAC,OAAO,EAAE,6BAA6B,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,CAAC,CAAC;gBAExE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,qDAAqD,EAAE;oBACzE,SAAS;oBACT,QAAQ;oBACR,QAAQ;oBACR,eAAe,EAAE,WAAW,CAAC,SAAS;oBACtC,WAAW;oBACX,YAAY;oBACZ,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;iBAC/B,CAAC,CAAC;gBAEH,8BAA8B,EAAE,EAAE,CAAC;gBAEnC,2FAA2F;gBAC3F,0FAA0F;gBAC1F,OAAO;YACT,CAAC;YAED,4FAA4F;YAC5F,6FAA6F;YAC7F,0FAA0F;YAC1F,4FAA4F;YAC5F,qFAAqF;YACrF,gCAAgC;YAChC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;YAC5C,IAAI,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC/B,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;gBAChD,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,sBAAsB,EAAE,CAAC,KAAK,CAAC;gBAC5E,IAAI,cAAc,IAAI,UAAU,EAAE,CAAC;oBACjC,wFAAwF;oBACxF,SAAS,CAAC,gCAAgC,EAAE,CAAC;gBAC/C,CAAC;qBAAM,CAAC;oBACN,MAAM,UAAU,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;oBACjD,IACE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,IAAI,uBAAuB;wBACxD,UAAU,IAAI,UAAU,GAAG,6BAA6B,IAAI,yCAAyC;wBACrG,UAAU,GAAG,UAAU;wBACvB,qFAAqF;wBACrF,YAAY,KAAK,SAAS,EAC1B,CAAC;wBACD,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,2BAA2B,CAAC,CAAC;wBAC1F,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,EAAE,uBAAuB,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;wBACnF,MAAM,MAAM,GAAG,SAAS,CAAC,gCAAgC,CAAC,6BAA6B,EAAE,aAAa,CAAC,CAAC;wBACxG,cAAc,EAAE,EAAE,CAAC;wBAEnB,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,EAAE,uBAAuB,CAAC;wBAC/D,IAAI,gBAAgB,EAAE,CAAC;4BACrB,gBAAgB,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;4BAClE,gBAAgB,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;4BAChE,gBAAgB,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;4BACpE,gBAAgB,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;4BAChE,IAAI,MAAM,CAAC,2BAA2B,GAAG,CAAC,EAAE,CAAC;gCAC3C,gBAAgB,CAAC,eAAe,CAAC,GAAG,CAAC,EAAC,IAAI,EAAE,SAAS,EAAC,EAAE,MAAM,CAAC,2BAA2B,CAAC,CAAC;4BAC9F,CAAC;4BACD,IAAI,MAAM,CAAC,6BAA6B,GAAG,CAAC,EAAE,CAAC;gCAC7C,gBAAgB,CAAC,eAAe,CAAC,GAAG,CAAC,EAAC,IAAI,EAAE,WAAW,EAAC,EAAE,MAAM,CAAC,6BAA6B,CAAC,CAAC;4BAClG,CAAC;4BACD,IAAI,MAAM,CAAC,6BAA6B,GAAG,CAAC,EAAE,CAAC;gCAC7C,gBAAgB,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAC,IAAI,EAAE,SAAS,EAAC,EAAE,MAAM,CAAC,6BAA6B,CAAC,CAAC;4BAClG,CAAC;4BACD,IAAI,MAAM,CAAC,+BAA+B,GAAG,CAAC,EAAE,CAAC;gCAC/C,gBAAgB,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAC,IAAI,EAAE,WAAW,EAAC,EAAE,MAAM,CAAC,+BAA+B,CAAC,CAAC;4BACtG,CAAC;wBACH,CAAC;wBAED,kFAAkF;wBAClF,mDAAmD;wBACnD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,0DAA0D,EAAE;4BAC9E,SAAS;4BACT,2BAA2B,EAAE,MAAM,CAAC,2BAA2B;4BAC/D,6BAA6B,EAAE,MAAM,CAAC,6BAA6B;4BACnE,6BAA6B,EAAE,MAAM,CAAC,6BAA6B;4BACnE,+BAA+B,EAAE,MAAM,CAAC,+BAA+B;4BACvE,sBAAsB,EAAE,MAAM,CAAC,sBAAsB;4BACrD,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;4BAC/C,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;4BAC/C,oBAAoB,EAAE,MAAM,CAAC,oBAAoB;yBAClD,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC;gBAClD,IAAI,CAAC,OAAO,EAAE,6BAA6B,CAAC,KAAK,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,OAAO,EAAC,EAAE,CAAC,CAAC,CAAC;gBAC5E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE,EAAC,SAAS,EAAE,iBAAiB,EAAE,WAAW,EAAC,EAAE,CAAU,CAAC,CAAC;YACjH,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IAEF;;;OAGG;IACK,4BAA4B,CAAC,WAAiB;QACpD,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,oCAAoC,CAAC,CAAC;QAClG,MAAM,YAAY,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,YAAY,CAAC;QAC9E,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;aAC1C,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC;aACrD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;gBACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,EAAE,EAAC,WAAW,EAAC,EAAE,CAAU,CAAC,CAAC;YACjF,CAAC;QACH,CAAC,CAAC,CAAC;IACP,CAAC;IAED,wBAAwB,CAAC,KAAuB,EAAE,iBAA0B;QAC1E,2IAA2I;QAC3I,wDAAwD;QACxD,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,EAAE,qBAAqB,CAAC,UAAU,CAAC;YACvE,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC,CAAC,uBAAuB,CAAC,eAAe;SAC/G,CAAC,CAAC;QACH,KAAK,CAAC,YAAY,EAAE,CAAC;QACrB,iBAAiB,EAAE,EAAE,CAAC;IACxB,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"prepareNextSlot.js","sourceRoot":"","sources":["../../src/chain/prepareNextSlot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,eAAe,CAAC;AAErC,OAAO,EAAC,8BAA8B,EAAE,yBAAyB,EAAC,MAAM,uBAAuB,CAAC;AAChG,OAAO,EAEL,OAAO,EACP,eAAe,EACf,mBAAmB,EACnB,cAAc,EACd,eAAe,GAChB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,6BAA6B,EAG7B,6BAA6B,EAC7B,uBAAuB,EACvB,kBAAkB,EAClB,iBAAiB,EACjB,oBAAoB,EACpB,eAAe,EACf,gBAAgB,GACjB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAS,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,EAAC,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAC,aAAa,EAAC,MAAM,8BAA8B,CAAC;AAG3D,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAC,mBAAmB,EAAC,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC5B,uBAAuB,GACxB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAE7C,sCAAsC;AACtC,6GAA6G;AAC7G,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,CAAC;AAE1C,yDAAyD;AACzD,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAE9B;;mFAEmF;AACnF,MAAM,2BAA2B,GAAG,IAAI,CAAC;AAEzC;;;;;GAKG;AACH,MAAM,oCAAoC,GAAG,IAAI,CAAC;AAElD;;;;;;;;;;GAUG;AACH,MAAM,OAAO,wBAAwB;IAEhB,KAAK;IACL,MAAM;IACN,OAAO;IACP,MAAM;IACN,MAAM;IALzB,YACmB,KAAmB,EACnB,MAAuB,EACvB,OAAuB,EACvB,MAAc,EACd,MAAmB;qBAJnB,KAAK;sBACL,MAAM;uBACN,OAAO;sBACP,MAAM;sBACN,MAAM;QAEvB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC9D,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAC1B,OAAO,EACP,GAAG,EAAE;YACH,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACjE,CAAC,EACD,EAAC,IAAI,EAAE,IAAI,EAAC,CACb,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,kBAAkB,GAAG,KAAK,EAAE,SAAe,EAAiB,EAAE;QAC5D,MAAM,WAAW,GAAG,SAAS,GAAG,CAAC,CAAC;QAClC,MAAM,YAAY,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;QACrD,MAAM,SAAS,GAAG,kBAAkB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACpD,MAAM,iBAAiB,GAAG,YAAY,KAAK,SAAS,CAAC;QACrD,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAClD,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAEvD,qCAAqC;QACrC,+DAA+D;QAC/D,IAAI,WAAW,IAAI,YAAY,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,SAAS,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC;YAC7F,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,2FAA2F;YAC3F,iCAAiC;YACjC,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,WAAW,EAAE,qBAAqB,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAErG,kFAAkF;YAClF,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;YACvF,MAAM,EAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAC,GAAG,SAAS,CAAC;YACxD,4DAA4D;YAC5D,IAAI,WAAW,GAAG,SAAS,CAAC;YAE5B,iFAAiF;YACjF,gDAAgD;YAChD,IAAI,WAAW,GAAG,QAAQ,GAAG,mBAAmB,GAAG,eAAe,EAAE,CAAC;gBACnE,IAAI,CAAC,OAAO,EAAE,6BAA6B,CAAC,KAAK,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,MAAM,EAAC,EAAE,CAAC,CAAC,CAAC;gBAC3E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0EAA0E,EAAE;oBAC5F,SAAS;oBACT,QAAQ;oBACR,SAAS;iBACV,CAAC,CAAC;gBAEH,OAAO;YACT,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,4BAA4B,EAAE;gBAChD,SAAS;gBACT,WAAW;gBACX,QAAQ;gBACR,QAAQ;gBACR,iBAAiB;aAClB,CAAC,CAAC;YACH,MAAM,8BAA8B,GAAG,iBAAiB;gBACtD,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,6BAA6B,CAAC,QAAQ,CAAC,UAAU,EAAE;gBACnE,CAAC,CAAC,IAAI,CAAC;YACT,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACzB,IAAI,YAAgC,CAAC;YACrC,8CAA8C;YAC9C,IAAI,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC9B,IAAI,aAA2C,CAAC;gBAEhD,MAAM,gBAAgB,GAAG,KAAK,IAA6B,EAAE;oBAC3D,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;wBACzB,sEAAsE;wBACtE,2EAA2E;wBAC3E,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;oBAClE,CAAC;oBACD,8HAA8H;oBAC9H,0HAA0H;oBAC1H,8FAA8F;oBAC9F,aAAa,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,iBAAiB,CACtD,SAAS,EACT,WAAW,EACX,EAAC,iBAAiB,EAAE,CAAC,iBAAiB,EAAC,EACvC,WAAW,CAAC,eAAe,CAC5B,CAAC;oBACF,OAAO,aAAa,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;gBACtD,CAAC,CAAC;gBAEF,MAAM,aAAa,GAAG,MAAM,gBAAgB,EAAE,CAAC;gBAC/C,IAAI,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;oBACtD,MAAM,iBAAiB,GAAG,eAAe,CAAC,IAAI,CAAC;wBAC7C,CAAC,CAAC,4BAA4B,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,EAAE,QAAQ,CAAC;wBACjE,CAAC,CAAC,IAAI,CAAC;oBACT,YAAY;wBACV,iBAAiB,KAAK,IAAI;4BACxB,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,YAAY,CAAC;4BACvC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;gBACnE,CAAC;gBAED,0DAA0D;gBAC1D,2EAA2E;gBAC3E,+EAA+E;gBAC/E,uFAAuF;gBACvF,wFAAwF;gBACxF,IAAI,YAAY,IAAI,iBAAiB,EAAE,CAAC;oBACtC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC;oBACtD,MAAM,EAAC,IAAI,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,EAAC,GAAG,YAAY,CAAC;oBAE3E,6FAA6F;oBAC7F,IAAI,gBAAgB,KAAK,QAAQ,IAAI,gBAAgB,KAAK,QAAQ,EAAE,CAAC;wBACnE,+EAA+E;wBAC/E,+EAA+E;wBAC/E,MAAM,UAAU,GAAG,YAAY;4BAC7B,CAAC,CAAC,0DAA0D;4BAC5D,CAAC,CAAC,wEAAwE,CAAC;wBAC7E,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE;4BAC9B,gBAAgB;4BAChB,gBAAgB;4BAChB,QAAQ;4BACR,QAAQ;4BACR,iBAAiB;yBAClB,CAAC,CAAC;wBACH,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,GAAG,EAAE,CAAC;wBACrC,IAAI,iBAAiB,EAAE,CAAC;4BACtB,IAAI,CAAC,OAAO,EAAE,6BAA6B,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC;wBACnE,CAAC;wBACD,WAAW,GAAG,YAAY,CAAC;oBAC7B,CAAC;gBACH,CAAC;gBAED,IAAI,YAAY,EAAE,CAAC;oBACjB,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC1B,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;wBAChE,IAAI,CAAC,4BAA4B,CAAC,WAAW,CAAC,CAAC;oBACjD,CAAC;yBAAM,CAAC;wBACN,0EAA0E;wBAC1E,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;wBAC1C,IAAI,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,MAAM,KAAK,aAAa,CAAC,OAAO,EAAE,CAAC;4BAClE,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gCACpD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iDAAiD,EAAE,EAAC,WAAW,EAAC,EAAE,CAAU,CAAC,CAAC;4BAClG,CAAC,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,uEAAuE;gBACvE,8DAA8D;gBAC9D,IAAI,aAAa,KAAK,SAAS,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;oBAC7D,aAAa,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,iBAAiB,CACtD,WAAW,EACX,WAAW;oBACX,2HAA2H;oBAC3H,EAAC,iBAAiB,EAAE,CAAC,iBAAiB,EAAC,EACvC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC,WAAW,CAAC,mBAAmB,CAC1F,CAAC;gBACJ,CAAC;gBAED,IAAI,CAAC,oBAAoB,CAAC,aAAa,CAAC,EAAE,CAAC;oBACzC,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;gBACrE,CAAC;gBAED,IAAI,eAAwB,CAAC;gBAC7B,8EAA8E;gBAC9E,IAAI,uBAAuB,GAA8B,aAAa,CAAC;gBACvE,IAAI,gBAAgB,CAAC,aAAa,CAAC,EAAE,CAAC;oBACpC,uFAAuF;oBACvF,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,iBAAiB,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,CAAC;wBACtE,eAAe,GAAG,aAAa,CAAC,yBAAyB,CAAC,SAAS,CAAC;wBACpE,8GAA8G;wBAC9G,IAAI,YAAY,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,qBAAqB,KAAK,IAAI,EAAE,CAAC;4BACjF,MAAM,uBAAuB,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,0BAA0B,CACzE,WAAW,CAAC,IAAI,EAChB,WAAW,CAAC,SAAS,CACtB,CAAC;4BACF,uBAAuB,GAAG,aAAa,CAAC,wBAAwB,CAAC,uBAAuB,CAAC,CAAC;wBAC5F,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACN,eAAe,GAAG,aAAa,CAAC,yBAAyB,CAAC,eAAe,CAAC;oBAC5E,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,eAAe,GAAG,aAAa,CAAC,4BAA4B,CAAC,SAAS,CAAC;gBACzE,CAAC;gBAED,4EAA4E;gBAC5E,MAAM,aAAa,GAAG,yBAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;gBACpF,MAAM,kBAAkB,GAAG,8BAA8B,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBAEjF,IAAI,iBAAgD,CAAC;gBACrD,0EAA0E;gBAC1E,0FAA0F;gBAC1F,IACE,CAAC,YAAY,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,qBAAqB,KAAK,IAAI,CAAC;oBAChE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,EAC3E,CAAC;oBACD,MAAM,IAAI,GAAG,0BAA0B,CAAC,IAAyB,EAAE,IAAI,CAAC,KAAK,EAAE;wBAC7E,YAAY,EAAE,uBAAuB;wBACrC,WAAW;wBACX,eAAe,EAAE,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC;wBAC/C,eAAe;wBACf,aAAa;wBACb,kBAAkB;wBAClB,YAAY,EAAE,YAAY,IAAI,4CAA4C;qBAC3E,CAAC,CAAC;oBACH,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,EAAE,EAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC,CAAC;oBAC1F,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC;gBAC7C,CAAC;gBAED,IAAI,YAAY,EAAE,CAAC;oBACjB,MAAM,eAAe,GACnB,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;oBAC1F,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;oBAE3E,iFAAiF;oBACjF,kFAAkF;oBAClF,0BAA0B;oBAC1B,MAAM,uBAAuB,CAC3B,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,MAAM,EACX,IAAyB,EAAE,6BAA6B;oBACxD,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,EAC9B,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,uBAAuB,EACvB,YAAY,EACZ,iBAAiB,CAClB,CAAC;oBACF,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,+CAA+C,EAAE;wBACnE,WAAW;wBACX,aAAa;wBACb,YAAY;qBACb,CAAC,CAAC;gBACL,CAAC;gBAED,IAAI,CAAC,wBAAwB,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;YAClE,CAAC;iBAAM,CAAC;gBACN,4FAA4F;gBAC5F,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,iBAAiB,CAC5D,SAAS,EACT,WAAW,EACX,EAAC,iBAAiB,EAAE,CAAC,iBAAiB,EAAC,EACvC,WAAW,CAAC,eAAe,CAC5B,CAAC;gBACF,IAAI,CAAC,wBAAwB,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;YAClE,CAAC;YAED,0HAA0H;YAC1H,2EAA2E;YAC3E,+GAA+G;YAC/G,IAAI,iBAAiB,EAAE,CAAC;gBACtB,IAAI,CAAC,OAAO,EAAE,6BAA6B,CAAC,KAAK,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,SAAS,EAAC,EAAE,CAAC,CAAC,CAAC;gBAC9E,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,2BAA2B,CAAC,WAAW,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;gBACpG,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;oBACvB,IAAI,CAAC,OAAO,EAAE,6BAA6B,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;gBAC1D,CAAC;gBACD,IAAI,CAAC,OAAO,EAAE,6BAA6B,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,CAAC,CAAC;gBAExE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,qDAAqD,EAAE;oBACzE,SAAS;oBACT,QAAQ;oBACR,QAAQ;oBACR,eAAe,EAAE,WAAW,CAAC,SAAS;oBACtC,WAAW;oBACX,YAAY;oBACZ,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;iBAC/B,CAAC,CAAC;gBAEH,8BAA8B,EAAE,EAAE,CAAC;gBAEnC,2FAA2F;gBAC3F,0FAA0F;gBAC1F,OAAO;YACT,CAAC;YAED,4FAA4F;YAC5F,6FAA6F;YAC7F,0FAA0F;YAC1F,4FAA4F;YAC5F,qFAAqF;YACrF,gCAAgC;YAChC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;YAC5C,IAAI,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC/B,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;gBAChD,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,sBAAsB,EAAE,CAAC,KAAK,CAAC;gBAC5E,IAAI,cAAc,IAAI,UAAU,EAAE,CAAC;oBACjC,wFAAwF;oBACxF,SAAS,CAAC,gCAAgC,EAAE,CAAC;gBAC/C,CAAC;qBAAM,CAAC;oBACN,MAAM,UAAU,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;oBACjD,IACE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,IAAI,uBAAuB;wBACxD,UAAU,IAAI,UAAU,GAAG,6BAA6B,IAAI,yCAAyC;wBACrG,UAAU,GAAG,UAAU;wBACvB,qFAAqF;wBACrF,YAAY,KAAK,SAAS,EAC1B,CAAC;wBACD,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,WAAW,EAAE,2BAA2B,CAAC,CAAC;wBACvG,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,EAAE,uBAAuB,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;wBACnF,MAAM,MAAM,GAAG,SAAS,CAAC,gCAAgC,CAAC,6BAA6B,EAAE,aAAa,CAAC,CAAC;wBACxG,cAAc,EAAE,EAAE,CAAC;wBAEnB,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,EAAE,uBAAuB,CAAC;wBAC/D,IAAI,gBAAgB,EAAE,CAAC;4BACrB,gBAAgB,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;4BAClE,gBAAgB,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;4BAChE,gBAAgB,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;4BACpE,gBAAgB,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;4BAChE,IAAI,MAAM,CAAC,2BAA2B,GAAG,CAAC,EAAE,CAAC;gCAC3C,gBAAgB,CAAC,eAAe,CAAC,GAAG,CAAC,EAAC,IAAI,EAAE,SAAS,EAAC,EAAE,MAAM,CAAC,2BAA2B,CAAC,CAAC;4BAC9F,CAAC;4BACD,IAAI,MAAM,CAAC,6BAA6B,GAAG,CAAC,EAAE,CAAC;gCAC7C,gBAAgB,CAAC,eAAe,CAAC,GAAG,CAAC,EAAC,IAAI,EAAE,WAAW,EAAC,EAAE,MAAM,CAAC,6BAA6B,CAAC,CAAC;4BAClG,CAAC;4BACD,IAAI,MAAM,CAAC,6BAA6B,GAAG,CAAC,EAAE,CAAC;gCAC7C,gBAAgB,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAC,IAAI,EAAE,SAAS,EAAC,EAAE,MAAM,CAAC,6BAA6B,CAAC,CAAC;4BAClG,CAAC;4BACD,IAAI,MAAM,CAAC,+BAA+B,GAAG,CAAC,EAAE,CAAC;gCAC/C,gBAAgB,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAC,IAAI,EAAE,WAAW,EAAC,EAAE,MAAM,CAAC,+BAA+B,CAAC,CAAC;4BACtG,CAAC;wBACH,CAAC;wBAED,kFAAkF;wBAClF,mDAAmD;wBACnD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,0DAA0D,EAAE;4BAC9E,SAAS;4BACT,2BAA2B,EAAE,MAAM,CAAC,2BAA2B;4BAC/D,6BAA6B,EAAE,MAAM,CAAC,6BAA6B;4BACnE,6BAA6B,EAAE,MAAM,CAAC,6BAA6B;4BACnE,+BAA+B,EAAE,MAAM,CAAC,+BAA+B;4BACvE,sBAAsB,EAAE,MAAM,CAAC,sBAAsB;4BACrD,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;4BAC/C,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;4BAC/C,oBAAoB,EAAE,MAAM,CAAC,oBAAoB;yBAClD,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC;gBAClD,IAAI,CAAC,OAAO,EAAE,6BAA6B,CAAC,KAAK,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,OAAO,EAAC,EAAE,CAAC,CAAC,CAAC;gBAC5E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE,EAAC,SAAS,EAAE,iBAAiB,EAAE,WAAW,EAAC,EAAE,CAAU,CAAC,CAAC;YACjH,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IAEF;;;OAGG;IACK,4BAA4B,CAAC,WAAiB;QACpD,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,0BAA0B,CACzD,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,GAAG,CAAC,CAAC,EACxC,oCAAoC,CACrC,CAAC;QACF,MAAM,YAAY,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,YAAY,CAAC;QAC9E,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;aAC1C,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC;aACrD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;gBACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,EAAE,EAAC,WAAW,EAAC,EAAE,CAAU,CAAC,CAAC;YACjF,CAAC;QACH,CAAC,CAAC,CAAC;IACP,CAAC;IAED,wBAAwB,CAAC,KAAuB,EAAE,iBAA0B;QAC1E,2IAA2I;QAC3I,wDAAwD;QACxD,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,EAAE,qBAAqB,CAAC,UAAU,CAAC;YACvE,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC,CAAC,uBAAuB,CAAC,eAAe;SAC/G,CAAC,CAAC;QACH,KAAK,CAAC,YAAY,EAAE,CAAC;QACrB,iBAAiB,EAAE,EAAE,CAAC;IACxB,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"computeNewStateRoot.d.ts","sourceRoot":"","sources":["../../../src/chain/produceBlock/computeNewStateRoot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,gBAAgB,EAA0B,MAAM,4BAA4B,CAAC;AACtG,OAAO,
|
|
1
|
+
{"version":3,"file":"computeNewStateRoot.d.ts","sourceRoot":"","sources":["../../../src/chain/produceBlock/computeNewStateRoot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,gBAAgB,EAA0B,MAAM,4BAA4B,CAAC;AACtG,OAAO,EACL,WAAW,EACX,kBAAkB,EAClB,IAAI,EACJ,IAAI,EAGL,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,OAAO,EAAC,MAAM,wBAAwB,CAAC;AAE/C;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,GAAG,IAAI,EACvB,KAAK,EAAE,gBAAgB,EACvB,KAAK,EAAE,WAAW,GAAG,kBAAkB,GACtC;IAAC,YAAY,EAAE,IAAI,CAAC;IAAC,cAAc,EAAE,IAAI,CAAC;IAAC,SAAS,EAAE,gBAAgB,CAAA;CAAC,CAWzE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"computeNewStateRoot.js","sourceRoot":"","sources":["../../../src/chain/produceBlock/computeNewStateRoot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAoB,uBAAuB,EAAC,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"computeNewStateRoot.js","sourceRoot":"","sources":["../../../src/chain/produceBlock/computeNewStateRoot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAoB,uBAAuB,EAAC,MAAM,4BAA4B,CAAC;AAWtG;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CACjC,OAAuB,EACvB,KAAuB,EACvB,KAAuC;IAEvC,uGAAuG;IACvG,MAAM,WAAW,GAAG,EAAC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,eAAe,EAAiD,CAAC;IACjH,MAAM,EAAC,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,gBAAgB,EAAC,GAAG,KAAK,CAAC,mBAAmB,CAC3F,EAAC,KAAK,EAAE,WAAW,EAAC,EACpB,EAAC,OAAO,EAAE,OAAO,EAAE,eAAe,EAAC,CACpC,CAAC;IAEF,OAAO,EAAE,qBAAqB,CAAC,OAAO,CAAC,EAAC,MAAM,EAAE,uBAAuB,CAAC,mBAAmB,EAAC,EAAE,gBAAgB,CAAC,CAAC;IAEhH,OAAO,EAAC,YAAY,EAAE,cAAc,EAAE,SAAS,EAAC,CAAC;AACnD,CAAC"}
|
|
@@ -7,7 +7,7 @@ import { Logger } from "@lodestar/utils";
|
|
|
7
7
|
import { IExecutionEngine, PayloadAttributes, PayloadId } from "../../execution/index.js";
|
|
8
8
|
import type { BeaconChain } from "../chain.js";
|
|
9
9
|
import { CommonBlockBody } from "../interface.js";
|
|
10
|
-
import { ProposerPreferencesPool } from "../opPools/index.js";
|
|
10
|
+
import { InclusionListStore, ProposerPreferencesPool } from "../opPools/index.js";
|
|
11
11
|
export declare enum PayloadPreparationType {
|
|
12
12
|
Fresh = "Fresh",
|
|
13
13
|
Cached = "Cached",
|
|
@@ -98,6 +98,7 @@ export declare function prepareExecutionPayload(chain: {
|
|
|
98
98
|
config: ChainForkConfig;
|
|
99
99
|
forkChoice: IForkChoice;
|
|
100
100
|
proposerPreferencesPool: ProposerPreferencesPool;
|
|
101
|
+
inclusionListStore: InclusionListStore;
|
|
101
102
|
}, logger: Logger, fork: ForkPostBellatrix, parentBlockRoot: Root, parentBlockHash: Bytes32, safeBlockHash: RootHex, finalizedBlockHash: RootHex,
|
|
102
103
|
/**
|
|
103
104
|
* Post-gloas, when extending a full parent, callers must apply
|
|
@@ -113,6 +114,7 @@ export declare function getPayloadAttributesForSSE(fork: ForkPostBellatrix, chai
|
|
|
113
114
|
config: ChainForkConfig;
|
|
114
115
|
forkChoice: IForkChoice;
|
|
115
116
|
proposerPreferencesPool: ProposerPreferencesPool;
|
|
117
|
+
inclusionListStore: InclusionListStore;
|
|
116
118
|
}, { prepareState, prepareSlot, parentBlockRoot, parentBlockHash, safeBlockHash, finalizedBlockHash, feeRecipient, }: {
|
|
117
119
|
/**
|
|
118
120
|
* Post-gloas, when extending a full parent, callers must apply
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"produceBlockBody.d.ts","sourceRoot":"","sources":["../../../src/chain/produceBlock/produceBlockBody.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"produceBlockBody.d.ts","sourceRoot":"","sources":["../../../src/chain/produceBlock/produceBlockBody.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,WAAW,EACX,UAAU,EAGX,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAEL,QAAQ,EACR,iBAAiB,EAEjB,aAAa,EACb,YAAY,EACZ,aAAa,EAOd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAEL,gBAAgB,EAChB,KAAK,yBAAyB,EAO/B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,SAAS,EACT,YAAY,EACZ,WAAW,EACX,eAAe,EACf,kBAAkB,EAClB,sBAAsB,EACtB,WAAW,EACX,OAAO,EACP,gBAAgB,EAEhB,IAAI,EACJ,OAAO,EACP,oBAAoB,EACpB,IAAI,EACJ,cAAc,EACd,GAAG,EAMH,IAAI,EACJ,KAAK,EAGN,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEL,MAAM,EASP,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAoB,gBAAgB,EAAE,iBAAiB,EAAE,SAAS,EAAC,MAAM,0BAA0B,CAAC;AAK3G,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAC,eAAe,EAAC,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAC,kBAAkB,EAAE,uBAAuB,EAAC,MAAM,qBAAqB,CAAC;AAMhF,oBAAY,sBAAsB;IAChC,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,OAAO,YAAY;CACpB;AAED;;GAEG;AACH,oBAAY,mBAAmB;IAC7B,gBAAgB,qBAAqB;IACrC,iBAAiB,sBAAsB;IACvC,cAAc,mBAAmB;IACjC,qBAAqB,0BAA0B;IAC/C,YAAY,iBAAiB;IAC7B,aAAa,kBAAkB;IAC/B,gBAAgB,qBAAqB;CACtC;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,YAAY,EAAE,YAAY,CAAC;IAC3B,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,IAAI,CAAC;IACX,WAAW,EAAE,UAAU,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,4EAA4E;IAC5E,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,mFAAmF;IACnF,UAAU,CAAC,EAAE,KAAK,CAAC,yBAAyB,CAAC;CAC9C,CAAC;AAEF,oBAAY,SAAS;IACnB,IAAI,SAAS;IACb,OAAO,YAAY;CACpB;AACD,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,SAAS,IAAI,CAAC,SAAS,SAAS,CAAC,IAAI,GACzE,eAAe,GACf,sBAAsB,CAAC;AAC3B,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,SAAS,IAAI,CAAC,SAAS,SAAS,CAAC,IAAI,GAAG,WAAW,GAAG,kBAAkB,CAAC;AAElH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC;IACrB,IAAI,EAAE,aAAa,CAAC;IACpB,gBAAgB,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAClD,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,CAAC;IAC3C,WAAW,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IACxC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;IACrB,eAAe,EAAE,IAAI,CAAC;CACvB,CAAC;AACF,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC;IACrB,IAAI,EAAE,YAAY,CAAC;IACnB,gBAAgB,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IACjD,WAAW,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC;IACvC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;CACtB,CAAC;AACF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC;IACxC,gBAAgB,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAClD,WAAW,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;CACzC,CAAC;AACF,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC;IAC5C,gBAAgB,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;CACvD,CAAC;AACF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;CACzC,CAAC;AACF,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC;IACxB,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC;AAKF,mFAAmF;AACnF,MAAM,MAAM,aAAa,GACrB,gBAAgB,GAChB,eAAe,GACf,gBAAgB,GAChB,oBAAoB,GACpB,iBAAiB,GACjB,cAAc,CAAC;AAwBnB,wBAAsB,gBAAgB,CAAC,CAAC,SAAS,SAAS,EACxD,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,CAAC,EACZ,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,eAAe,GAAG;IAC3B,aAAa,EAAE,cAAc,CAAC;IAC9B,cAAc,EAAE,SAAS,CAAC;IAC1B,sBAAsB,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;CAClD,GACA,OAAO,CAAC;IACT,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC;IAC3B,aAAa,EAAE,aAAa,CAAC;IAC7B,qBAAqB,EAAE,GAAG,CAAC;IAC3B,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC,CAAC,CA6gBD;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE;IACL,eAAe,EAAE,gBAAgB,CAAC;IAClC,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,WAAW,CAAC;IACxB,uBAAuB,EAAE,uBAAuB,CAAC;IACjD,kBAAkB,EAAE,kBAAkB,CAAC;CACxC,EACD,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,iBAAiB,EACvB,eAAe,EAAE,IAAI,EACrB,eAAe,EAAE,OAAO,EACxB,aAAa,EAAE,OAAO,EACtB,kBAAkB,EAAE,OAAO;AAC3B;;;GAGG;AACH,KAAK,EAAE,yBAAyB,EAChC,qBAAqB,EAAE,MAAM;AAC7B,+FAA+F;AAC/F,iBAAiB,CAAC,EAAE,iBAAiB,GACpC,OAAO,CAAC;IAAC,QAAQ,EAAE,sBAAsB,CAAC;IAAC,SAAS,EAAE,SAAS,CAAA;CAAC,CAAC,CAsEnE;AAwBD,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,iBAAiB,EACvB,KAAK,EAAE;IACL,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,WAAW,CAAC;IACxB,uBAAuB,EAAE,uBAAuB,CAAC;IACjD,kBAAkB,EAAE,kBAAkB,CAAC;CACxC,EACD,EACE,YAAY,EACZ,WAAW,EACX,eAAe,EACf,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,YAAY,GACb,EAAE;IACD;;;OAGG;IACH,YAAY,EAAE,yBAAyB,CAAC;IACxC,WAAW,EAAE,IAAI,CAAC;IAClB,eAAe,EAAE,IAAI,CAAC;IACtB,eAAe,EAAE,OAAO,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;IACvB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;CACtB,GACA,oBAAoB,CA0BtB;AA6JD;;;GAGG;AACH,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE;IAAC,UAAU,EAAE,WAAW,CAAC;IAAC,uBAAuB,EAAE,uBAAuB,CAAA;CAAC,EAClF,IAAI,EAAE,IAAI,EACV,kBAAkB,EAAE,OAAO,GAC1B,KAAK,CAAC,mBAAmB,GAAG,IAAI,CAmBlC;AAED,wBAAsB,sBAAsB,CAAC,CAAC,SAAS,SAAS,EAC9D,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,CAAC,EACZ,YAAY,EAAE,gBAAgB,EAC9B,EAAC,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAC,EAAE,eAAe,GAC3D,OAAO,CAAC,eAAe,CAAC,CA8D1B"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { BitArray } from "@chainsafe/ssz";
|
|
2
1
|
import { getFinalizedExecutionBlockHash, getSafeExecutionBlockHash, } from "@lodestar/fork-choice";
|
|
3
|
-
import { BUILDER_INDEX_SELF_BUILD, ForkSeq,
|
|
2
|
+
import { BUILDER_INDEX_SELF_BUILD, ForkSeq, isForkPostAltair, isForkPostBellatrix, isForkPostGloas, isForkPostHeze, } from "@lodestar/params";
|
|
4
3
|
import { G2_POINT_AT_INFINITY, computeEpochAtSlot, computeTimeAtSlot, getExpectedGasLimit, isStatePostBellatrix, isStatePostCapella, isStatePostGloas, } from "@lodestar/state-transition";
|
|
5
4
|
import { ssz, } from "@lodestar/types";
|
|
6
5
|
import { GWEI_TO_WEI, byteArrayEquals, fromHex, prettyGweiToEth, prettyWeiToEth, sleep, toHex, toPubkeyHex, toRootHex, } from "@lodestar/utils";
|
|
@@ -179,8 +178,10 @@ export async function produceBlockBody(blockType, currentState, blockAttr) {
|
|
|
179
178
|
executionRequestsRoot: ssz.gloas.ExecutionRequests.hashTreeRoot(executionRequests),
|
|
180
179
|
};
|
|
181
180
|
if (ForkSeq[fork] >= ForkSeq.heze) {
|
|
182
|
-
//
|
|
183
|
-
|
|
181
|
+
// Built from the full view (only_timely=False), a superset of the receiver's timely-only
|
|
182
|
+
// is_inclusion_list_bits_inclusive check
|
|
183
|
+
const inclusionListSlot = blockSlot - 1;
|
|
184
|
+
bid.inclusionListBits = this.inclusionListStore.getInclusionListBits(inclusionListSlot, getShufflingDependentRoot(this.forkChoice, computeEpochAtSlot(inclusionListSlot), computeEpochAtSlot(parentBlock.slot), parentBlock), false);
|
|
184
185
|
}
|
|
185
186
|
const signedBid = {
|
|
186
187
|
message: bid,
|
|
@@ -405,11 +406,10 @@ export async function produceBlockBody(blockType, currentState, blockAttr) {
|
|
|
405
406
|
blockBody = Object.assign({}, commonBlockBody);
|
|
406
407
|
executionPayloadValue = BigInt(0);
|
|
407
408
|
}
|
|
408
|
-
const { graffiti, attestations,
|
|
409
|
+
const { graffiti, attestations, voluntaryExits, attesterSlashings, proposerSlashings } = blockBody;
|
|
409
410
|
Object.assign(logMeta, {
|
|
410
411
|
graffiti: fromGraffitiBytes(graffiti),
|
|
411
412
|
attestations: attestations.length,
|
|
412
|
-
deposits: deposits.length,
|
|
413
413
|
voluntaryExits: voluntaryExits.length,
|
|
414
414
|
attesterSlashings: attesterSlashings.length,
|
|
415
415
|
proposerSlashings: proposerSlashings.length,
|
|
@@ -456,12 +456,24 @@ state, suggestedFeeRecipient,
|
|
|
456
456
|
payloadAttributes) {
|
|
457
457
|
const timestamp = computeTimeAtSlot(chain.config, state.slot, state.genesisTime);
|
|
458
458
|
const prevRandao = state.getRandaoMix(state.epoch);
|
|
459
|
+
// Post-heze the inclusion lists are part of the cache key, so a list set that changed since the
|
|
460
|
+
// payload was prepared triggers a new forkchoiceUpdated instead of reusing a payload built without them
|
|
461
|
+
let attributes = payloadAttributes;
|
|
462
|
+
if (attributes === undefined && ForkSeq[fork] >= ForkSeq.heze) {
|
|
463
|
+
attributes = preparePayloadAttributes(fork, chain, {
|
|
464
|
+
prepareState: state,
|
|
465
|
+
prepareSlot: state.slot,
|
|
466
|
+
parentBlockRoot,
|
|
467
|
+
parentBlockHash,
|
|
468
|
+
feeRecipient: suggestedFeeRecipient,
|
|
469
|
+
});
|
|
470
|
+
}
|
|
459
471
|
const payloadIdCached = chain.executionEngine.payloadIdCache.get({
|
|
460
472
|
headBlockHash: toRootHex(parentBlockHash),
|
|
461
|
-
finalizedBlockHash,
|
|
462
473
|
timestamp: numToQuantity(timestamp),
|
|
463
474
|
prevRandao: toHex(prevRandao),
|
|
464
475
|
suggestedFeeRecipient,
|
|
476
|
+
inclusionListTransactions: attributes?.inclusionListTransactions,
|
|
465
477
|
});
|
|
466
478
|
// prepareExecutionPayload will throw error via notifyForkchoiceUpdate if
|
|
467
479
|
// the EL returns Syncing on this request to prepare a payload
|
|
@@ -481,15 +493,14 @@ payloadAttributes) {
|
|
|
481
493
|
else {
|
|
482
494
|
prepType = PayloadPreparationType.Fresh;
|
|
483
495
|
}
|
|
484
|
-
|
|
496
|
+
payloadId = await chain.executionEngine.notifyForkchoiceUpdate(fork, toRootHex(parentBlockHash), safeBlockHash, finalizedBlockHash, attributes ??
|
|
485
497
|
preparePayloadAttributes(fork, chain, {
|
|
486
498
|
prepareState: state,
|
|
487
499
|
prepareSlot: state.slot,
|
|
488
500
|
parentBlockRoot,
|
|
489
501
|
parentBlockHash,
|
|
490
502
|
feeRecipient: suggestedFeeRecipient,
|
|
491
|
-
});
|
|
492
|
-
payloadId = await chain.executionEngine.notifyForkchoiceUpdate(fork, toRootHex(parentBlockHash), safeBlockHash, finalizedBlockHash, attributes);
|
|
503
|
+
}));
|
|
493
504
|
logger.verbose("Prepared payload id from execution engine", { payloadId });
|
|
494
505
|
}
|
|
495
506
|
// Should never happen, notifyForkchoiceUpdate() with payload attributes always
|
|
@@ -577,8 +588,16 @@ function preparePayloadAttributes(fork, chain, { prepareState, prepareSlot, pare
|
|
|
577
588
|
payloadAttributes.targetGasLimit = getProposerTargetGasLimit(chain, prepareSlot, parentBlockRoot, parentBlockHash);
|
|
578
589
|
}
|
|
579
590
|
if (ForkSeq[fork] >= ForkSeq.heze) {
|
|
580
|
-
//
|
|
581
|
-
|
|
591
|
+
// Built from the full view including untimely lists (only_timely=False in prepare_execution_payload),
|
|
592
|
+
// a superset of the timely-only set every validator enforces
|
|
593
|
+
const parentBlockRootHex = toRootHex(parentBlockRoot);
|
|
594
|
+
const parentBlock = chain.forkChoice.getBlockHexAndBlockHash(parentBlockRootHex, toRootHex(parentBlockHash));
|
|
595
|
+
if (parentBlock === null) {
|
|
596
|
+
throw new Error(`Parent block not in fork choice for Heze payload attributes parentBlockRoot=${parentBlockRootHex} parentBlockHash=${toRootHex(parentBlockHash)}`);
|
|
597
|
+
}
|
|
598
|
+
const inclusionListSlot = prepareSlot - 1;
|
|
599
|
+
payloadAttributes.inclusionListTransactions =
|
|
600
|
+
chain.inclusionListStore.getInclusionListTransactions(inclusionListSlot, getShufflingDependentRoot(chain.forkChoice, computeEpochAtSlot(inclusionListSlot), computeEpochAtSlot(parentBlock.slot), parentBlock), false);
|
|
582
601
|
}
|
|
583
602
|
return payloadAttributes;
|
|
584
603
|
}
|
|
@@ -670,17 +689,20 @@ export async function produceCommonBlockBody(blockType, currentState, { randaoRe
|
|
|
670
689
|
step: BlockProductionStep.syncAggregate,
|
|
671
690
|
});
|
|
672
691
|
// Live proposal production is supported from Fulu onward.
|
|
673
|
-
|
|
692
|
+
const commonBlockBody = {
|
|
674
693
|
randaoReveal,
|
|
675
694
|
graffiti,
|
|
676
|
-
eth1Data: currentState.eth1Data,
|
|
677
695
|
proposerSlashings: this.opts.disableProposerSlashings === true ? [] : proposerSlashings,
|
|
678
696
|
attesterSlashings,
|
|
679
697
|
attestations,
|
|
680
|
-
deposits: [],
|
|
681
698
|
voluntaryExits,
|
|
682
699
|
blsToExecutionChanges,
|
|
683
700
|
syncAggregate,
|
|
684
701
|
};
|
|
702
|
+
if (!isForkPostHeze(fork)) {
|
|
703
|
+
commonBlockBody.eth1Data = currentState.eth1Data;
|
|
704
|
+
commonBlockBody.deposits = [];
|
|
705
|
+
}
|
|
706
|
+
return commonBlockBody;
|
|
685
707
|
}
|
|
686
708
|
//# sourceMappingURL=produceBlockBody.js.map
|