@lodestar/beacon-node 1.51.0-dev.32db66b396 → 1.51.0-dev.3da261f88e
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/api.js +1 -1
- package/lib/api/impl/api.js.map +1 -1
- package/lib/api/impl/beacon/blocks/index.d.ts +2 -1
- package/lib/api/impl/beacon/blocks/index.d.ts.map +1 -1
- package/lib/api/impl/beacon/blocks/index.js +12 -7
- package/lib/api/impl/beacon/blocks/index.js.map +1 -1
- package/lib/api/impl/beacon/index.d.ts +2 -1
- package/lib/api/impl/beacon/index.d.ts.map +1 -1
- package/lib/api/impl/beacon/index.js +2 -2
- package/lib/api/impl/beacon/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 +102 -10
- package/lib/api/impl/validator/index.js.map +1 -1
- package/lib/api/options.d.ts +2 -0
- package/lib/api/options.d.ts.map +1 -1
- package/lib/api/options.js +1 -0
- package/lib/api/options.js.map +1 -1
- package/lib/chain/blocks/importBlock.d.ts.map +1 -1
- package/lib/chain/blocks/importBlock.js +3 -2
- 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 +4 -1
- 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 +2 -1
- 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/produceBlock/produceBlockBody.d.ts +3 -1
- package/lib/chain/produceBlock/produceBlockBody.d.ts.map +1 -1
- package/lib/chain/produceBlock/produceBlockBody.js +30 -10
- package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
- package/lib/chain/regen/interface.d.ts +1 -1
- package/lib/chain/regen/interface.d.ts.map +1 -1
- package/lib/chain/regen/interface.js +1 -1
- package/lib/chain/regen/interface.js.map +1 -1
- package/lib/chain/validation/executionPayloadBid.d.ts +0 -15
- package/lib/chain/validation/executionPayloadBid.d.ts.map +1 -1
- package/lib/chain/validation/executionPayloadBid.js +24 -145
- 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/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/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/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 +2 -1
- package/lib/execution/engine/restTransport.d.ts.map +1 -1
- package/lib/execution/engine/restTransport.js +3 -0
- 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/types.d.ts +25 -1
- package/lib/execution/engine/types.d.ts.map +1 -1
- package/lib/execution/engine/types.js +17 -4
- 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 +12 -0
- package/lib/metrics/metrics/lodestar.d.ts.map +1 -1
- package/lib/metrics/metrics/lodestar.js +25 -0
- package/lib/metrics/metrics/lodestar.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 -5
- 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/processor/gossipHandlers.d.ts.map +1 -1
- package/lib/network/processor/gossipHandlers.js +67 -19
- 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 +37 -26
- 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/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 +4 -0
- 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/sync/unknownBlock.d.ts.map +1 -1
- package/lib/sync/unknownBlock.js +42 -18
- package/lib/sync/unknownBlock.js.map +1 -1
- package/package.json +30 -30
- package/src/api/impl/api.ts +1 -1
- package/src/api/impl/beacon/blocks/index.ts +22 -17
- package/src/api/impl/beacon/index.ts +3 -1
- 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 +132 -10
- package/src/api/options.ts +3 -0
- package/src/chain/blocks/importBlock.ts +3 -7
- package/src/chain/blocks/importExecutionPayload.ts +68 -2
- package/src/chain/blocks/types.ts +5 -0
- package/src/chain/chain.ts +4 -0
- 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 +2 -0
- package/src/chain/opPools/inclusionListStore.ts +208 -0
- package/src/chain/opPools/index.ts +1 -0
- package/src/chain/produceBlock/produceBlockBody.ts +60 -19
- package/src/chain/regen/interface.ts +1 -1
- package/src/chain/validation/executionPayloadBid.ts +40 -170
- package/src/chain/validation/inclusionList.ts +192 -0
- package/src/chain/validation/index.ts +1 -0
- 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/interface.ts +27 -3
- 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 +15 -1
- package/src/execution/engine/transport.ts +7 -2
- package/src/execution/engine/types.ts +41 -6
- package/src/metrics/metrics/beacon.ts +37 -0
- package/src/metrics/metrics/lodestar.ts +26 -0
- 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/processor/gossipHandlers.ts +87 -21
- package/src/network/processor/gossipQueues/index.ts +6 -0
- package/src/network/processor/gossipValidatorFn.ts +5 -0
- package/src/network/processor/index.ts +33 -24
- package/src/network/processor/types.ts +1 -1
- package/src/network/reqresp/ReqRespBeaconNode.ts +7 -0
- 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 +4 -0
- package/src/network/reqresp/types.ts +6 -0
- package/src/sync/unknownBlock.ts +47 -28
|
@@ -62,7 +62,7 @@ import {
|
|
|
62
62
|
} from "../../../../chain/produceBlock/index.js";
|
|
63
63
|
import {RegenCaller} from "../../../../chain/regen/index.js";
|
|
64
64
|
import {validateGossipBlock, verifyBlockProposerSignature} from "../../../../chain/validation/block.js";
|
|
65
|
-
import {
|
|
65
|
+
import {validateGossipExecutionPayloadBid} from "../../../../chain/validation/executionPayloadBid.js";
|
|
66
66
|
import {validateApiExecutionPayloadEnvelope} from "../../../../chain/validation/executionPayloadEnvelope.js";
|
|
67
67
|
import {OpSource} from "../../../../chain/validatorMonitor.js";
|
|
68
68
|
import {
|
|
@@ -79,6 +79,7 @@ import {
|
|
|
79
79
|
import {isOptimisticBlock} from "../../../../util/forkChoice.js";
|
|
80
80
|
import {kzg} from "../../../../util/kzg.js";
|
|
81
81
|
import {promiseAllMaybeAsync} from "../../../../util/promises.js";
|
|
82
|
+
import {ApiOptions} from "../../../options.js";
|
|
82
83
|
import {ApiModules} from "../../types.js";
|
|
83
84
|
import {assertUniqueItems} from "../../utils.js";
|
|
84
85
|
import {getBlockResponse, toBeaconHeaderResponse} from "./utils.js";
|
|
@@ -96,16 +97,10 @@ const MAX_API_CLOCK_DISPARITY_MS = 1000;
|
|
|
96
97
|
*/
|
|
97
98
|
const IDENTITY_PEER_ID = ""; // TODO: Compute identity keypair
|
|
98
99
|
|
|
99
|
-
export function getBeaconBlockApi(
|
|
100
|
-
|
|
101
|
-
config,
|
|
102
|
-
|
|
103
|
-
network,
|
|
104
|
-
db,
|
|
105
|
-
}: Pick<
|
|
106
|
-
ApiModules,
|
|
107
|
-
"chain" | "config" | "metrics" | "network" | "db"
|
|
108
|
-
>): ApplicationMethods<routes.beacon.block.Endpoints> {
|
|
100
|
+
export function getBeaconBlockApi(
|
|
101
|
+
opts: ApiOptions,
|
|
102
|
+
{chain, config, metrics, network, db}: Pick<ApiModules, "chain" | "config" | "metrics" | "network" | "db">
|
|
103
|
+
): ApplicationMethods<routes.beacon.block.Endpoints> {
|
|
109
104
|
const publishBlockV2: ApplicationMethods<routes.beacon.block.Endpoints>["publishBlockV2"] = async (
|
|
110
105
|
{signedBlockContents, broadcastValidation, builderUrl},
|
|
111
106
|
context,
|
|
@@ -1077,15 +1072,25 @@ export function getBeaconBlockApi({
|
|
|
1077
1072
|
throw new ApiError(400, `publishExecutionPayloadBid not supported for pre-gloas fork=${fork}`);
|
|
1078
1073
|
}
|
|
1079
1074
|
|
|
1080
|
-
const validationTimer = metrics?.opPool.executionPayloadBidPool.apiValidationTime.startTimer();
|
|
1081
|
-
// TODO: once the builder is tested and can be trusted, skip this local validation
|
|
1082
|
-
// to publish faster, accepting peer-score risk if it ever emits an invalid bid.
|
|
1083
|
-
await validateApiExecutionPayloadBid(chain, signedExecutionPayloadBid);
|
|
1084
|
-
validationTimer?.();
|
|
1085
|
-
|
|
1086
1075
|
const elapsedSec = chain.clock.secFromSlot(slot, seenTimestampSec);
|
|
1087
1076
|
metrics?.gossipExecutionPayloadBid.elapsedTimeTillReceived.observe({source: OpSource.api}, elapsedSec);
|
|
1088
1077
|
|
|
1078
|
+
if (!opts.disableBidValidation) {
|
|
1079
|
+
const validationTimer = metrics?.opPool.executionPayloadBidPool.apiValidationTime.startTimer();
|
|
1080
|
+
const {proposerIndex} = await validateGossipExecutionPayloadBid(chain, signedExecutionPayloadBid);
|
|
1081
|
+
validationTimer?.();
|
|
1082
|
+
|
|
1083
|
+
// Gossip does not deliver our own messages back to us, so a validated bid is added to the
|
|
1084
|
+
// pool here to allow a proposer on this node to select it
|
|
1085
|
+
const insertOutcome = chain.executionPayloadBidPool.add(
|
|
1086
|
+
signedExecutionPayloadBid,
|
|
1087
|
+
Math.floor(elapsedSec * 1000)
|
|
1088
|
+
);
|
|
1089
|
+
metrics?.opPool.executionPayloadBidPool.apiInsertOutcome.inc({insertOutcome});
|
|
1090
|
+
|
|
1091
|
+
chain.validatorMonitor?.registerExecutionPayloadBid(OpSource.api, proposerIndex, bid);
|
|
1092
|
+
}
|
|
1093
|
+
|
|
1089
1094
|
const sentPeers = await network.publishSignedExecutionPayloadBid(signedExecutionPayloadBid);
|
|
1090
1095
|
|
|
1091
1096
|
chain.emitter.emit(routes.events.EventType.executionPayloadBid, {
|
|
@@ -3,6 +3,7 @@ import {ApplicationMethods} from "@lodestar/api/server";
|
|
|
3
3
|
import {isForkPostGloas} from "@lodestar/params";
|
|
4
4
|
import {computeStartSlotAtEpoch} from "@lodestar/state-transition";
|
|
5
5
|
import {toRootHex} from "@lodestar/utils";
|
|
6
|
+
import {ApiOptions} from "../../options.js";
|
|
6
7
|
import {ApiError} from "../errors.js";
|
|
7
8
|
import {ApiModules} from "../types.js";
|
|
8
9
|
import {getBeaconBlockApi} from "./blocks/index.js";
|
|
@@ -11,9 +12,10 @@ import {getBeaconRewardsApi} from "./rewards/index.js";
|
|
|
11
12
|
import {getBeaconStateApi} from "./state/index.js";
|
|
12
13
|
|
|
13
14
|
export function getBeaconApi(
|
|
15
|
+
opts: ApiOptions,
|
|
14
16
|
modules: Pick<ApiModules, "chain" | "config" | "logger" | "metrics" | "network" | "db" | "sync">
|
|
15
17
|
): ApplicationMethods<routes.beacon.Endpoints> {
|
|
16
|
-
const block = getBeaconBlockApi(modules);
|
|
18
|
+
const block = getBeaconBlockApi(opts, modules);
|
|
17
19
|
const pool = getBeaconPoolApi(modules);
|
|
18
20
|
const state = getBeaconStateApi(modules);
|
|
19
21
|
const rewards = getBeaconRewardsApi(modules);
|
|
@@ -17,6 +17,7 @@ import {
|
|
|
17
17
|
isStatePostGloas,
|
|
18
18
|
} from "@lodestar/state-transition";
|
|
19
19
|
import {
|
|
20
|
+
BuilderIndex,
|
|
20
21
|
ValidatorIndex,
|
|
21
22
|
getBuilderStatus,
|
|
22
23
|
getValidatorStatus,
|
|
@@ -29,6 +30,7 @@ import {ApiModules} from "../../types.js";
|
|
|
29
30
|
import {assertUniqueItems} from "../../utils.js";
|
|
30
31
|
import {
|
|
31
32
|
filterStateValidatorsByStatus,
|
|
33
|
+
getBuilderIndexByPubkey,
|
|
32
34
|
getStateBuilderIndex,
|
|
33
35
|
getStateResponseWithRegen,
|
|
34
36
|
getStateValidatorIndex,
|
|
@@ -170,8 +172,15 @@ export function getBeaconStateApi({
|
|
|
170
172
|
if (builderIds.length) {
|
|
171
173
|
assertUniqueItems(builderIds, "Duplicate builder IDs provided");
|
|
172
174
|
|
|
175
|
+
// There is no builder pubkey cache, scan the registry at most once per request
|
|
176
|
+
let builderIndexByPubkey: Map<string, BuilderIndex> | null = null;
|
|
177
|
+
const getBuilderIndexByPubkeyMap = () => {
|
|
178
|
+
builderIndexByPubkey ??= getBuilderIndexByPubkey(state);
|
|
179
|
+
return builderIndexByPubkey;
|
|
180
|
+
};
|
|
181
|
+
|
|
173
182
|
for (const id of builderIds) {
|
|
174
|
-
const resp = getStateBuilderIndex(id, state);
|
|
183
|
+
const resp = getStateBuilderIndex(id, state, getBuilderIndexByPubkeyMap);
|
|
175
184
|
if (resp.valid) {
|
|
176
185
|
const builderIndex = resp.builderIndex;
|
|
177
186
|
const builder = state.getBuilder(builderIndex);
|
|
@@ -13,7 +13,7 @@ import {
|
|
|
13
13
|
getValidatorStatus,
|
|
14
14
|
phase0,
|
|
15
15
|
} from "@lodestar/types";
|
|
16
|
-
import {
|
|
16
|
+
import {fromHex, toHex} from "@lodestar/utils";
|
|
17
17
|
import {IBeaconChain} from "../../../../chain/index.js";
|
|
18
18
|
import {GENESIS_EPOCH} from "../../../../constants/index.js";
|
|
19
19
|
import {IBeaconSync} from "../../../../sync/index.js";
|
|
@@ -118,9 +118,22 @@ type StateBuilderIndexResponse =
|
|
|
118
118
|
| {valid: true; builderIndex: BuilderIndex}
|
|
119
119
|
| {valid: false; code: number; reason: string};
|
|
120
120
|
|
|
121
|
+
export function getBuilderIndexByPubkey(state: IBeaconStateViewGloas): Map<string, BuilderIndex> {
|
|
122
|
+
const builderIndexByPubkey = new Map<string, BuilderIndex>();
|
|
123
|
+
const buildersLength = state.getBuildersLength();
|
|
124
|
+
for (let builderIndex = 0; builderIndex < buildersLength; builderIndex++) {
|
|
125
|
+
const pubkeyHex = toHex(state.getBuilder(builderIndex).pubkey);
|
|
126
|
+
if (!builderIndexByPubkey.has(pubkeyHex)) {
|
|
127
|
+
builderIndexByPubkey.set(pubkeyHex, builderIndex);
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
return builderIndexByPubkey;
|
|
131
|
+
}
|
|
132
|
+
|
|
121
133
|
export function getStateBuilderIndex(
|
|
122
134
|
id: routes.beacon.BuilderId | BLSPubkey,
|
|
123
|
-
state: IBeaconStateViewGloas
|
|
135
|
+
state: IBeaconStateViewGloas,
|
|
136
|
+
getBuilderIndexByPubkeyMap: () => Map<string, BuilderIndex>
|
|
124
137
|
): StateBuilderIndexResponse {
|
|
125
138
|
if (typeof id === "string") {
|
|
126
139
|
// mutate `id` and fallthrough to below
|
|
@@ -148,14 +161,11 @@ export function getStateBuilderIndex(
|
|
|
148
161
|
}
|
|
149
162
|
|
|
150
163
|
// typeof id === Uint8Array
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
if (byteArrayEquals(state.getBuilder(builderIndex).pubkey, id)) {
|
|
155
|
-
return {valid: true, builderIndex};
|
|
156
|
-
}
|
|
164
|
+
const builderIndex = getBuilderIndexByPubkeyMap().get(toHex(id));
|
|
165
|
+
if (builderIndex === undefined) {
|
|
166
|
+
return {valid: false, code: 404, reason: "Builder pubkey not found in state"};
|
|
157
167
|
}
|
|
158
|
-
return {valid:
|
|
168
|
+
return {valid: true, builderIndex};
|
|
159
169
|
}
|
|
160
170
|
|
|
161
171
|
export function filterStateValidatorsByStatus(
|
|
@@ -114,6 +114,10 @@ export function getDebugApi({
|
|
|
114
114
|
unrealizedJustifiedRoot: node.unrealizedJustifiedRoot,
|
|
115
115
|
unrealizedFinalizedEpoch: node.unrealizedFinalizedEpoch,
|
|
116
116
|
unrealizedFinalizedRoot: node.unrealizedFinalizedRoot,
|
|
117
|
+
inclusionListSatisfied:
|
|
118
|
+
node.payloadStatus === PayloadStatus.FULL
|
|
119
|
+
? forkChoice.getPayloadInclusionListSatisfaction(node.blockRoot)
|
|
120
|
+
: null,
|
|
117
121
|
},
|
|
118
122
|
};
|
|
119
123
|
}),
|
|
@@ -18,6 +18,7 @@ import {
|
|
|
18
18
|
isForkPostElectra,
|
|
19
19
|
isForkPostFulu,
|
|
20
20
|
isForkPostGloas,
|
|
21
|
+
isForkPostHeze,
|
|
21
22
|
} from "@lodestar/params";
|
|
22
23
|
import {
|
|
23
24
|
DataAvailabilityStatus,
|
|
@@ -28,6 +29,7 @@ import {
|
|
|
28
29
|
computeStartSlotAtEpoch,
|
|
29
30
|
computeTimeAtSlot,
|
|
30
31
|
getCurrentSlot,
|
|
32
|
+
getInclusionListCommittee,
|
|
31
33
|
isStatePostAltair,
|
|
32
34
|
isStatePostGloas,
|
|
33
35
|
proposerShufflingDecisionRoot,
|
|
@@ -68,6 +70,7 @@ import {
|
|
|
68
70
|
} from "@lodestar/utils";
|
|
69
71
|
import {MAX_BUILDER_BOOST_FACTOR} from "@lodestar/validator";
|
|
70
72
|
import {BlockInputSource} from "../../../chain/blocks/blockInput/types.js";
|
|
73
|
+
import {InclusionListSource} from "../../../chain/blocks/types.js";
|
|
71
74
|
import {
|
|
72
75
|
AttestationError,
|
|
73
76
|
AttestationErrorCode,
|
|
@@ -83,7 +86,11 @@ import {PREPARE_NEXT_SLOT_BPS} from "../../../chain/prepareNextSlot.js";
|
|
|
83
86
|
import {BlockType, ProduceFullDeneb, ProduceFullGloas} from "../../../chain/produceBlock/index.js";
|
|
84
87
|
import {RegenCaller} from "../../../chain/regen/index.js";
|
|
85
88
|
import {CheckpointHex} from "../../../chain/stateCache/types.js";
|
|
86
|
-
import {
|
|
89
|
+
import {
|
|
90
|
+
InclusionListValidationResult,
|
|
91
|
+
validateApiAggregateAndProof,
|
|
92
|
+
validateGossipInclusionList,
|
|
93
|
+
} from "../../../chain/validation/index.js";
|
|
87
94
|
import {validateGossipProposerPreferences} from "../../../chain/validation/proposerPreferences.js";
|
|
88
95
|
import {validateSyncCommitteeGossipContributionAndProof} from "../../../chain/validation/syncCommitteeContributionAndProof.js";
|
|
89
96
|
import {ZERO_HASH} from "../../../constants/index.js";
|
|
@@ -247,13 +254,13 @@ export function getValidatorApi(
|
|
|
247
254
|
genesisBlockRoot = state.computeAnchorCheckpoint().checkpoint.root;
|
|
248
255
|
} else if (state.slot < SLOTS_PER_HISTORICAL_ROOT) {
|
|
249
256
|
genesisBlockRoot = state.getBlockRootAtSlot(GENESIS_SLOT);
|
|
250
|
-
}
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
+
} else {
|
|
258
|
+
const blockRes = await chain.getCanonicalBlockAtSlot(GENESIS_SLOT);
|
|
259
|
+
if (blockRes) {
|
|
260
|
+
genesisBlockRoot = config
|
|
261
|
+
.getForkTypes(blockRes.block.message.slot)
|
|
262
|
+
.BeaconBlock.hashTreeRoot(blockRes.block.message);
|
|
263
|
+
}
|
|
257
264
|
}
|
|
258
265
|
}
|
|
259
266
|
|
|
@@ -1700,7 +1707,7 @@ export function getValidatorApi(
|
|
|
1700
1707
|
}
|
|
1701
1708
|
}
|
|
1702
1709
|
|
|
1703
|
-
const dependentRoot = fromHex(state.getShufflingDecisionRoot(epoch))
|
|
1710
|
+
const dependentRoot = fromHex(state.getShufflingDecisionRoot(epoch));
|
|
1704
1711
|
|
|
1705
1712
|
return {
|
|
1706
1713
|
data: duties,
|
|
@@ -1749,7 +1756,7 @@ export function getValidatorApi(
|
|
|
1749
1756
|
}
|
|
1750
1757
|
}
|
|
1751
1758
|
|
|
1752
|
-
const dependentRoot = fromHex(state.getShufflingDecisionRoot(epoch))
|
|
1759
|
+
const dependentRoot = fromHex(state.getShufflingDecisionRoot(epoch));
|
|
1753
1760
|
|
|
1754
1761
|
return {
|
|
1755
1762
|
data: duties,
|
|
@@ -2198,6 +2205,121 @@ export function getValidatorApi(
|
|
|
2198
2205
|
}
|
|
2199
2206
|
},
|
|
2200
2207
|
|
|
2208
|
+
async produceInclusionList({slot}) {
|
|
2209
|
+
notWhileSyncing(chain, sync.state);
|
|
2210
|
+
|
|
2211
|
+
if (!isForkPostHeze(chain.config.getForkName(slot))) {
|
|
2212
|
+
throw new ApiError(400, `Producing inclusion list for pre-heze slot: ${slot}`);
|
|
2213
|
+
}
|
|
2214
|
+
|
|
2215
|
+
await waitForSlot(slot); // Must never request for a future slot > currentSlot
|
|
2216
|
+
|
|
2217
|
+
const timer = metrics?.getInclusionListV1RequestsDuration.startTimer();
|
|
2218
|
+
const transactions = await chain.executionEngine.getInclusionList();
|
|
2219
|
+
timer?.();
|
|
2220
|
+
metrics?.getInclusionListV1Requests.inc();
|
|
2221
|
+
|
|
2222
|
+
return {data: transactions, meta: {version: chain.config.getForkName(slot)}};
|
|
2223
|
+
},
|
|
2224
|
+
|
|
2225
|
+
async getInclusionListCommitteeDuties({epoch, indices}) {
|
|
2226
|
+
notWhileSyncing(chain, sync.state);
|
|
2227
|
+
|
|
2228
|
+
if (indices.length === 0) {
|
|
2229
|
+
throw new ApiError(400, "No validator to get inclusion list committee duties");
|
|
2230
|
+
}
|
|
2231
|
+
|
|
2232
|
+
if (!isForkPostHeze(chain.config.getForkName(computeStartSlotAtEpoch(epoch)))) {
|
|
2233
|
+
throw new ApiError(400, `Requesting pre-heze inclusion list committee duties epoch: ${epoch}`);
|
|
2234
|
+
}
|
|
2235
|
+
|
|
2236
|
+
// May request for an epoch that's in the future
|
|
2237
|
+
await waitForNextClosestEpoch();
|
|
2238
|
+
|
|
2239
|
+
if (epoch > chain.clock.currentEpoch + 1) {
|
|
2240
|
+
throw new ApiError(400, "Cannot get duties for epoch more than one ahead");
|
|
2241
|
+
}
|
|
2242
|
+
|
|
2243
|
+
const head = chain.forkChoice.getHead();
|
|
2244
|
+
const state = await chain.getHeadStateAtCurrentEpoch(RegenCaller.getDuties);
|
|
2245
|
+
|
|
2246
|
+
const pubkeys = getPubkeysForIndices(state, indices);
|
|
2247
|
+
const requestedIndices = new Set(indices);
|
|
2248
|
+
const epochStartSlot = computeStartSlotAtEpoch(epoch);
|
|
2249
|
+
const shuffling = state.getShufflingAtEpoch(epoch);
|
|
2250
|
+
|
|
2251
|
+
// Validators set this as `dependent_root` on their inclusion lists
|
|
2252
|
+
const dependentRoot = fromHex(state.getShufflingDecisionRoot(epoch));
|
|
2253
|
+
|
|
2254
|
+
// A validator can be on several slots' committees in an epoch; report the earliest, as for attester duties
|
|
2255
|
+
const dutySlotByValidator = new Map<ValidatorIndex, Slot>();
|
|
2256
|
+
for (let i = 0; i < SLOTS_PER_EPOCH; i++) {
|
|
2257
|
+
const slot = epochStartSlot + i;
|
|
2258
|
+
for (const validatorIndex of getInclusionListCommittee(shuffling, slot).validatorIndices) {
|
|
2259
|
+
if (requestedIndices.has(validatorIndex) && !dutySlotByValidator.has(validatorIndex)) {
|
|
2260
|
+
dutySlotByValidator.set(validatorIndex, slot);
|
|
2261
|
+
}
|
|
2262
|
+
}
|
|
2263
|
+
}
|
|
2264
|
+
|
|
2265
|
+
const duties: routes.validator.InclusionListDuty[] = [];
|
|
2266
|
+
for (let i = 0; i < indices.length; i++) {
|
|
2267
|
+
const validatorIndex = indices[i];
|
|
2268
|
+
const slot = dutySlotByValidator.get(validatorIndex);
|
|
2269
|
+
if (slot !== undefined) {
|
|
2270
|
+
duties.push({pubkey: pubkeys[i], validatorIndex, slot, dependentRoot});
|
|
2271
|
+
}
|
|
2272
|
+
}
|
|
2273
|
+
|
|
2274
|
+
return {
|
|
2275
|
+
data: duties,
|
|
2276
|
+
meta: {
|
|
2277
|
+
dependentRoot: toRootHex(dependentRoot),
|
|
2278
|
+
executionOptimistic: isOptimisticBlock(head),
|
|
2279
|
+
},
|
|
2280
|
+
};
|
|
2281
|
+
},
|
|
2282
|
+
|
|
2283
|
+
async publishInclusionList({signedInclusionList}) {
|
|
2284
|
+
notWhileSyncing(chain, sync.state);
|
|
2285
|
+
|
|
2286
|
+
const {slot} = signedInclusionList.message;
|
|
2287
|
+
if (!isForkPostHeze(chain.config.getForkName(slot))) {
|
|
2288
|
+
throw new ApiError(400, `Publishing pre-heze inclusion list slot: ${slot}`);
|
|
2289
|
+
}
|
|
2290
|
+
|
|
2291
|
+
// Timeliness is judged on receipt, as for gossip, so a list submitted in time stays timely if validation is slow
|
|
2292
|
+
const secFromSlot = chain.clock.secFromSlot(slot, Date.now() / 1000);
|
|
2293
|
+
metrics?.inclusionListsReceived.inc({source: InclusionListSource.api});
|
|
2294
|
+
metrics?.inclusionListTransactionsReceived.inc(
|
|
2295
|
+
{source: InclusionListSource.api},
|
|
2296
|
+
signedInclusionList.message.transactions.length
|
|
2297
|
+
);
|
|
2298
|
+
|
|
2299
|
+
const timer = metrics?.inclusionListsValidationTime.startTimer();
|
|
2300
|
+
let validationResult: InclusionListValidationResult;
|
|
2301
|
+
try {
|
|
2302
|
+
validationResult = await validateGossipInclusionList(chain, signedInclusionList);
|
|
2303
|
+
} finally {
|
|
2304
|
+
timer?.({source: InclusionListSource.api});
|
|
2305
|
+
}
|
|
2306
|
+
const {committeeIndices, totalBytes} = validationResult;
|
|
2307
|
+
metrics?.inclusionListsValid.inc({source: InclusionListSource.api});
|
|
2308
|
+
metrics?.inclusionListsValidSize.inc(totalBytes);
|
|
2309
|
+
|
|
2310
|
+
const isTimely =
|
|
2311
|
+
secFromSlot >= 0 && secFromSlot * 1000 < chain.config.getInclusionListDueMs(chain.config.getForkName(slot));
|
|
2312
|
+
chain.inclusionListStore.process(signedInclusionList, committeeIndices, isTimely);
|
|
2313
|
+
|
|
2314
|
+
chain.emitter.emit(routes.events.EventType.inclusionList, {
|
|
2315
|
+
version: chain.config.getForkName(slot),
|
|
2316
|
+
data: signedInclusionList,
|
|
2317
|
+
});
|
|
2318
|
+
|
|
2319
|
+
await network.publishInclusionList(signedInclusionList);
|
|
2320
|
+
metrics?.inclusionListsPublished.inc();
|
|
2321
|
+
},
|
|
2322
|
+
|
|
2201
2323
|
async getExecutionPayloadEnvelope({slot, beaconBlockRoot}) {
|
|
2202
2324
|
const fork = config.getForkName(slot);
|
|
2203
2325
|
|
package/src/api/options.ts
CHANGED
|
@@ -2,6 +2,8 @@ import {BeaconRestApiServerOpts, beaconRestApiServerOpts} from "./rest/index.js"
|
|
|
2
2
|
|
|
3
3
|
export type ApiOptions = {
|
|
4
4
|
maxGindicesInProof?: number;
|
|
5
|
+
/** Broadcast execution payload bids submitted via the API without running gossip validation */
|
|
6
|
+
disableBidValidation?: boolean;
|
|
5
7
|
rest: BeaconRestApiServerOpts;
|
|
6
8
|
commit?: string;
|
|
7
9
|
version?: string;
|
|
@@ -10,6 +12,7 @@ export type ApiOptions = {
|
|
|
10
12
|
|
|
11
13
|
export const defaultApiOptions: ApiOptions = {
|
|
12
14
|
maxGindicesInProof: 512,
|
|
15
|
+
disableBidValidation: false,
|
|
13
16
|
rest: beaconRestApiServerOpts,
|
|
14
17
|
version: "dev",
|
|
15
18
|
private: false,
|
|
@@ -458,7 +458,8 @@ export async function importBlock(
|
|
|
458
458
|
* - `headBlockHash !== null` -> Pre BELLATRIX_EPOCH
|
|
459
459
|
* - `headBlockHash !== ZERO_HASH` -> Pre TTD
|
|
460
460
|
*/
|
|
461
|
-
const
|
|
461
|
+
const fcuHead = this.forkChoice.getHead();
|
|
462
|
+
const headBlockHash = fcuHead.executionPayloadBlockHash ?? ZERO_HASH_HEX;
|
|
462
463
|
/**
|
|
463
464
|
* After BELLATRIX_EPOCH and TTD it's okay to send a zero hash block hash for the finalized block. This will happen if
|
|
464
465
|
* the current finalized block does not contain any execution payload at all (pre MERGE_EPOCH) or if it contains a
|
|
@@ -468,12 +469,7 @@ export async function importBlock(
|
|
|
468
469
|
const finalizedBlockHash = getFinalizedExecutionBlockHash(this.forkChoice);
|
|
469
470
|
if (headBlockHash !== ZERO_HASH_HEX) {
|
|
470
471
|
this.executionEngine
|
|
471
|
-
.notifyForkchoiceUpdate(
|
|
472
|
-
this.config.getForkName(this.forkChoice.getHead().slot),
|
|
473
|
-
headBlockHash,
|
|
474
|
-
safeBlockHash,
|
|
475
|
-
finalizedBlockHash
|
|
476
|
-
)
|
|
472
|
+
.notifyForkchoiceUpdate(this.config.getForkName(fcuHead.slot), headBlockHash, safeBlockHash, finalizedBlockHash)
|
|
477
473
|
.catch((e) => {
|
|
478
474
|
if (!isErrorAborted(e) && !isQueueErrorAborted(e)) {
|
|
479
475
|
this.logger.error("Error pushing notifyForkchoiceUpdate()", {headBlockHash, finalizedBlockHash}, e);
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import {SerializedList} from "@chainsafe/ssz";
|
|
1
2
|
import {routes} from "@lodestar/api";
|
|
2
3
|
import {
|
|
3
4
|
ExecutionStatus,
|
|
@@ -5,9 +6,16 @@ import {
|
|
|
5
6
|
getFinalizedExecutionBlockHash,
|
|
6
7
|
getSafeExecutionBlockHash,
|
|
7
8
|
} from "@lodestar/fork-choice";
|
|
8
|
-
import {
|
|
9
|
+
import {
|
|
10
|
+
DataAvailabilityStatus,
|
|
11
|
+
computeEpochAtSlot,
|
|
12
|
+
isStatePostGloas,
|
|
13
|
+
isStatePostHeze,
|
|
14
|
+
} from "@lodestar/state-transition";
|
|
15
|
+
import {RootHex, bellatrix} from "@lodestar/types";
|
|
9
16
|
import {isErrorAborted} from "@lodestar/utils";
|
|
10
17
|
import {ExecutionPayloadStatus} from "../../execution/index.js";
|
|
18
|
+
import {getShufflingDependentRoot} from "../../util/dependentRoot.js";
|
|
11
19
|
import {isQueueErrorAborted} from "../../util/queue/index.js";
|
|
12
20
|
import {BeaconChain} from "../chain.js";
|
|
13
21
|
import {RegenCaller} from "../regen/interface.js";
|
|
@@ -172,6 +180,37 @@ export async function importExecutionPayload(
|
|
|
172
180
|
);
|
|
173
181
|
}
|
|
174
182
|
|
|
183
|
+
// Timely inclusion lists of the preceding slot, keyed by that slot's dependent root on the block's branch and
|
|
184
|
+
// resolved from the parent, which is at or before that slot. Gossip validation only accepts lists whose dependent
|
|
185
|
+
// block is in fork choice, so a dependent root fork choice cannot resolve (below the anchor after checkpoint sync)
|
|
186
|
+
// keys no stored list
|
|
187
|
+
let inclusionListTransactions: bellatrix.Transactions | undefined;
|
|
188
|
+
if (isStatePostHeze(blockState)) {
|
|
189
|
+
const inclusionListSlot = protoBlock.slot - 1;
|
|
190
|
+
let dependentRoot: RootHex | null = null;
|
|
191
|
+
const parentBlock = this.forkChoice.getBlockHexDefaultStatus(protoBlock.parentRoot);
|
|
192
|
+
if (parentBlock !== null) {
|
|
193
|
+
try {
|
|
194
|
+
dependentRoot = getShufflingDependentRoot(
|
|
195
|
+
this.forkChoice,
|
|
196
|
+
computeEpochAtSlot(inclusionListSlot),
|
|
197
|
+
computeEpochAtSlot(parentBlock.slot),
|
|
198
|
+
parentBlock
|
|
199
|
+
);
|
|
200
|
+
} catch (e) {
|
|
201
|
+
this.logger.debug(
|
|
202
|
+
"Inclusion list dependent root not in fork choice, importing payload without lists",
|
|
203
|
+
{slot, root: blockRootHex},
|
|
204
|
+
e as Error
|
|
205
|
+
);
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
inclusionListTransactions =
|
|
209
|
+
dependentRoot === null
|
|
210
|
+
? SerializedList.empty()
|
|
211
|
+
: this.inclusionListStore.getInclusionListTransactions(inclusionListSlot, dependentRoot, true);
|
|
212
|
+
}
|
|
213
|
+
|
|
175
214
|
// 4a. Run EL and signature verification in parallel
|
|
176
215
|
const logCtx = {slot, root: blockRootHex, executionBlock: envelope.payload.blockNumber};
|
|
177
216
|
this.logger.debug("Call engine api newPayload", logCtx);
|
|
@@ -182,7 +221,8 @@ export async function importExecutionPayload(
|
|
|
182
221
|
envelope.payload,
|
|
183
222
|
payloadInput.getVersionedHashes(),
|
|
184
223
|
envelope.parentBeaconBlockRoot,
|
|
185
|
-
envelope.executionRequests
|
|
224
|
+
envelope.executionRequests,
|
|
225
|
+
inclusionListTransactions
|
|
186
226
|
),
|
|
187
227
|
|
|
188
228
|
opts.validSignature === true
|
|
@@ -250,6 +290,32 @@ export async function importExecutionPayload(
|
|
|
250
290
|
}
|
|
251
291
|
});
|
|
252
292
|
|
|
293
|
+
// A VALID payload that does not satisfy the inclusion list constraints is still imported, fork choice
|
|
294
|
+
// only records the verdict so should_extend_payload moves the head to the EMPTY variant, which the next
|
|
295
|
+
// proposer builds on.
|
|
296
|
+
// Recorded before the payload enters fork choice. A VALID response must carry a verdict, an
|
|
297
|
+
// optimistically imported payload counts as satisfied until the engine validates it, anything else as
|
|
298
|
+
// unsatisfied. A VALID response without a verdict violates the engine API, it is logged and treated as
|
|
299
|
+
// satisfied so a non-compliant engine does not orphan every payload
|
|
300
|
+
if (inclusionListTransactions !== undefined) {
|
|
301
|
+
if (execResult.status === ExecutionPayloadStatus.VALID && execResult.inclusionListSatisfied == null) {
|
|
302
|
+
this.logger.warn("Execution engine reported no inclusion list verdict, not enforcing inclusion lists", logCtx);
|
|
303
|
+
}
|
|
304
|
+
const satisfied =
|
|
305
|
+
execResult.status === ExecutionPayloadStatus.VALID
|
|
306
|
+
? (execResult.inclusionListSatisfied ?? true)
|
|
307
|
+
: execResult.status === ExecutionPayloadStatus.SYNCING || execResult.status === ExecutionPayloadStatus.ACCEPTED;
|
|
308
|
+
this.forkChoice.recordPayloadInclusionListSatisfaction(blockRootHex, satisfied);
|
|
309
|
+
if (!satisfied) {
|
|
310
|
+
this.logger.verbose("Payload did not satisfy inclusion list constraints", {
|
|
311
|
+
...logCtx,
|
|
312
|
+
blockHash: blockHashHex,
|
|
313
|
+
status: execResult.status,
|
|
314
|
+
inclusionListTransactions: inclusionListTransactions.length,
|
|
315
|
+
});
|
|
316
|
+
}
|
|
317
|
+
}
|
|
318
|
+
|
|
253
319
|
// 6. Update fork choice, transitions the block's PENDING variant to FULL
|
|
254
320
|
const execStatus = toForkChoiceExecutionStatus(execResult.status);
|
|
255
321
|
this.forkChoice.onExecutionPayload(
|
|
@@ -12,6 +12,11 @@ export enum GossipedInputType {
|
|
|
12
12
|
dataColumn = "data_column",
|
|
13
13
|
}
|
|
14
14
|
|
|
15
|
+
export enum InclusionListSource {
|
|
16
|
+
gossip = "gossip",
|
|
17
|
+
api = "api",
|
|
18
|
+
}
|
|
19
|
+
|
|
15
20
|
type DataColumnData = {
|
|
16
21
|
dataColumn: fulu.DataColumnSidecar;
|
|
17
22
|
dataColumnBytes: Uint8Array | null;
|
package/src/chain/chain.ts
CHANGED
|
@@ -100,6 +100,7 @@ import {
|
|
|
100
100
|
AttestationPool,
|
|
101
101
|
DeferredVoluntaryExitPool,
|
|
102
102
|
ExecutionPayloadBidPool,
|
|
103
|
+
InclusionListStore,
|
|
103
104
|
OpPool,
|
|
104
105
|
PayloadAttestationPool,
|
|
105
106
|
ProposerPreferencesPool,
|
|
@@ -198,6 +199,7 @@ export class BeaconChain implements IBeaconChain {
|
|
|
198
199
|
readonly executionPayloadBidPool: ExecutionPayloadBidPool;
|
|
199
200
|
readonly payloadAttestationPool: PayloadAttestationPool;
|
|
200
201
|
readonly proposerPreferencesPool = new ProposerPreferencesPool();
|
|
202
|
+
readonly inclusionListStore: InclusionListStore;
|
|
201
203
|
readonly opPool: OpPool;
|
|
202
204
|
readonly deferredVoluntaryExitPool: DeferredVoluntaryExitPool;
|
|
203
205
|
|
|
@@ -335,6 +337,7 @@ export class BeaconChain implements IBeaconChain {
|
|
|
335
337
|
this.payloadAttestationPool = new PayloadAttestationPool(config, clock, metrics);
|
|
336
338
|
this.opPool = new OpPool(config);
|
|
337
339
|
this.deferredVoluntaryExitPool = new DeferredVoluntaryExitPool(logger);
|
|
340
|
+
this.inclusionListStore = new InclusionListStore(config);
|
|
338
341
|
|
|
339
342
|
this.seenAggregatedAttestations = new SeenAggregatedAttestations(metrics);
|
|
340
343
|
this.seenContributionAndProof = new SeenContributionAndProof(metrics);
|
|
@@ -1832,6 +1835,7 @@ export class BeaconChain implements IBeaconChain {
|
|
|
1832
1835
|
this.executionPayloadBidPool.prune(slot);
|
|
1833
1836
|
this.seenExecutionPayloadBids.prune(slot);
|
|
1834
1837
|
this.proposerPreferencesPool.prune(slot);
|
|
1838
|
+
this.inclusionListStore.prune(slot);
|
|
1835
1839
|
this.seenAttestationDatas.onSlot(slot);
|
|
1836
1840
|
this.reprocessController.onSlot(slot);
|
|
1837
1841
|
|
|
@@ -21,6 +21,8 @@ export enum ExecutionPayloadBidErrorCode {
|
|
|
21
21
|
NO_MATCHING_PROPOSER_PREFERENCES = "EXECUTION_PAYLOAD_BID_ERROR_NO_MATCHING_PROPOSER_PREFERENCES",
|
|
22
22
|
PROPOSER_PREFERENCES_FEE_RECIPIENT_MISMATCH = "EXECUTION_PAYLOAD_BID_ERROR_PROPOSER_PREFERENCES_FEE_RECIPIENT_MISMATCH",
|
|
23
23
|
PROPOSER_PREFERENCES_GAS_LIMIT_MISMATCH = "EXECUTION_PAYLOAD_BID_ERROR_PROPOSER_PREFERENCES_GAS_LIMIT_MISMATCH",
|
|
24
|
+
INCLUSION_LIST_BITS_NOT_INCLUSIVE = "EXECUTION_PAYLOAD_BID_ERROR_INCLUSION_LIST_BITS_NOT_INCLUSIVE",
|
|
25
|
+
BEFORE_INCLUSION_LIST_DEADLINE = "EXECUTION_PAYLOAD_BID_ERROR_BEFORE_INCLUSION_LIST_DEADLINE",
|
|
24
26
|
}
|
|
25
27
|
|
|
26
28
|
export type ExecutionPayloadBidErrorType =
|
|
@@ -86,6 +88,16 @@ export type ExecutionPayloadBidErrorType =
|
|
|
86
88
|
bidFeeRecipient: string;
|
|
87
89
|
expectedFeeRecipient: string;
|
|
88
90
|
}
|
|
91
|
+
| {
|
|
92
|
+
code: ExecutionPayloadBidErrorCode.INCLUSION_LIST_BITS_NOT_INCLUSIVE;
|
|
93
|
+
builderIndex: BuilderIndex;
|
|
94
|
+
slot: Slot;
|
|
95
|
+
}
|
|
96
|
+
| {
|
|
97
|
+
code: ExecutionPayloadBidErrorCode.BEFORE_INCLUSION_LIST_DEADLINE;
|
|
98
|
+
builderIndex: BuilderIndex;
|
|
99
|
+
slot: Slot;
|
|
100
|
+
}
|
|
89
101
|
| {
|
|
90
102
|
code: ExecutionPayloadBidErrorCode.PROPOSER_PREFERENCES_GAS_LIMIT_MISMATCH;
|
|
91
103
|
builderIndex: BuilderIndex;
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import {Epoch, RootHex, Slot, ValidatorIndex} from "@lodestar/types";
|
|
2
|
+
import {GossipActionError} from "./gossipValidation.js";
|
|
3
|
+
|
|
4
|
+
export enum InclusionListErrorCode {
|
|
5
|
+
EMPTY_TRANSACTIONS = "INCLUSION_LIST_ERROR_EMPTY_TRANSACTIONS",
|
|
6
|
+
MAXIMUM_SIZE_EXCEEDED = "INCLUSION_LIST_ERROR_MAXIMUM_SIZE_EXCEEDED",
|
|
7
|
+
EMPTY_TRANSACTION = "INCLUSION_LIST_ERROR_EMPTY_TRANSACTION",
|
|
8
|
+
INVALID_SLOT = "INCLUSION_LIST_ERROR_INVALID_SLOT",
|
|
9
|
+
MORE_THAN_TWO = "INCLUSION_LIST_ERROR_MORE_THAN_TWO",
|
|
10
|
+
VALIDATOR_NOT_IN_COMMITTEE = "INCLUSION_LIST_ERROR_VALIDATOR_NOT_IN_COMMITTEE",
|
|
11
|
+
UNKNOWN_DEPENDENT_ROOT = "INCLUSION_LIST_ERROR_UNKNOWN_DEPENDENT_ROOT",
|
|
12
|
+
INVALID_DEPENDENT_ROOT_SLOT = "INCLUSION_LIST_ERROR_INVALID_DEPENDENT_ROOT_SLOT",
|
|
13
|
+
INVALID_DEPENDENT_ROOT = "INCLUSION_LIST_ERROR_INVALID_DEPENDENT_ROOT",
|
|
14
|
+
MISSING_SHUFFLING = "INCLUSION_LIST_ERROR_MISSING_SHUFFLING",
|
|
15
|
+
INVALID_SIGNATURE = "INCLUSION_LIST_ERROR_INVALID_SIGNATURE",
|
|
16
|
+
PRE_HEZE_SLOT = "INCLUSION_LIST_ERROR_PRE_HEZE_SLOT",
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
export type InclusionListErrorType =
|
|
20
|
+
| {code: InclusionListErrorCode.EMPTY_TRANSACTIONS}
|
|
21
|
+
| {code: InclusionListErrorCode.MAXIMUM_SIZE_EXCEEDED; totalBytes: number; maxBytes: number}
|
|
22
|
+
| {code: InclusionListErrorCode.EMPTY_TRANSACTION; transactionIndex: number}
|
|
23
|
+
| {code: InclusionListErrorCode.INVALID_SLOT; inclusionListSlot: Slot; currentSlot: Slot}
|
|
24
|
+
| {code: InclusionListErrorCode.MORE_THAN_TWO; validatorIndex: ValidatorIndex}
|
|
25
|
+
| {code: InclusionListErrorCode.VALIDATOR_NOT_IN_COMMITTEE; validatorIndex: ValidatorIndex}
|
|
26
|
+
| {code: InclusionListErrorCode.UNKNOWN_DEPENDENT_ROOT; dependentRoot: RootHex}
|
|
27
|
+
| {
|
|
28
|
+
code: InclusionListErrorCode.INVALID_DEPENDENT_ROOT_SLOT;
|
|
29
|
+
dependentRoot: RootHex;
|
|
30
|
+
dependentSlot: Slot;
|
|
31
|
+
maxSlot: Slot;
|
|
32
|
+
}
|
|
33
|
+
| {code: InclusionListErrorCode.INVALID_DEPENDENT_ROOT; dependentRoot: RootHex; epoch: Epoch}
|
|
34
|
+
| {code: InclusionListErrorCode.MISSING_SHUFFLING; dependentRoot: RootHex; epoch: Epoch}
|
|
35
|
+
| {code: InclusionListErrorCode.INVALID_SIGNATURE}
|
|
36
|
+
| {code: InclusionListErrorCode.PRE_HEZE_SLOT; inclusionListSlot: Slot};
|
|
37
|
+
|
|
38
|
+
export class InclusionListError extends GossipActionError<InclusionListErrorType> {}
|
|
@@ -8,6 +8,7 @@ export * from "./envelopeReconstructionError.js";
|
|
|
8
8
|
export * from "./executionPayloadBid.js";
|
|
9
9
|
export * from "./executionPayloadEnvelope.js";
|
|
10
10
|
export * from "./gossipValidation.js";
|
|
11
|
+
export * from "./inclusionList.js";
|
|
11
12
|
export * from "./payloadAttestation.js";
|
|
12
13
|
export * from "./proposerPreferences.js";
|
|
13
14
|
export * from "./proposerSlashingError.js";
|
package/src/chain/interface.ts
CHANGED
|
@@ -49,6 +49,7 @@ import {
|
|
|
49
49
|
AttestationPool,
|
|
50
50
|
DeferredVoluntaryExitPool,
|
|
51
51
|
ExecutionPayloadBidPool,
|
|
52
|
+
InclusionListStore,
|
|
52
53
|
OpPool,
|
|
53
54
|
PayloadAttestationPool,
|
|
54
55
|
ProposerPreferencesPool,
|
|
@@ -131,6 +132,7 @@ export interface IBeaconChain {
|
|
|
131
132
|
readonly executionPayloadBidPool: ExecutionPayloadBidPool;
|
|
132
133
|
readonly payloadAttestationPool: PayloadAttestationPool;
|
|
133
134
|
readonly proposerPreferencesPool: ProposerPreferencesPool;
|
|
135
|
+
readonly inclusionListStore: InclusionListStore;
|
|
134
136
|
readonly opPool: OpPool;
|
|
135
137
|
readonly deferredVoluntaryExitPool: DeferredVoluntaryExitPool;
|
|
136
138
|
|