@lodestar/beacon-node 1.51.0-dev.83da04fef3 → 1.51.0-dev.a1662c7de7
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/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 +95 -5
- package/lib/api/impl/validator/index.js.map +1 -1
- package/lib/chain/ColumnReconstructionTracker.d.ts +11 -11
- package/lib/chain/ColumnReconstructionTracker.d.ts.map +1 -1
- package/lib/chain/ColumnReconstructionTracker.js +46 -40
- package/lib/chain/ColumnReconstructionTracker.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 +49 -2
- package/lib/chain/blocks/importExecutionPayload.js.map +1 -1
- package/lib/chain/blocks/types.d.ts +4 -0
- package/lib/chain/blocks/types.d.ts.map +1 -1
- package/lib/chain/blocks/types.js +5 -0
- package/lib/chain/blocks/types.js.map +1 -1
- package/lib/chain/chain.d.ts +2 -1
- package/lib/chain/chain.d.ts.map +1 -1
- package/lib/chain/chain.js +5 -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 -9
- 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/validation/executionPayloadBid.d.ts.map +1 -1
- package/lib/chain/validation/executionPayloadBid.js +33 -1
- package/lib/chain/validation/executionPayloadBid.js.map +1 -1
- package/lib/chain/validation/inclusionList.d.ts +14 -0
- package/lib/chain/validation/inclusionList.d.ts.map +1 -0
- package/lib/chain/validation/inclusionList.js +141 -0
- package/lib/chain/validation/inclusionList.js.map +1 -0
- package/lib/chain/validation/index.d.ts +1 -0
- package/lib/chain/validation/index.d.ts.map +1 -1
- package/lib/chain/validation/index.js +1 -0
- package/lib/chain/validation/index.js.map +1 -1
- package/lib/execution/builder/validateBid.d.ts.map +1 -1
- package/lib/execution/builder/validateBid.js +14 -1
- package/lib/execution/builder/validateBid.js.map +1 -1
- package/lib/execution/engine/disabled.d.ts +1 -0
- package/lib/execution/engine/disabled.d.ts.map +1 -1
- package/lib/execution/engine/disabled.js +3 -0
- package/lib/execution/engine/disabled.js.map +1 -1
- package/lib/execution/engine/http.d.ts +8 -2
- package/lib/execution/engine/http.d.ts.map +1 -1
- package/lib/execution/engine/http.js +28 -4
- package/lib/execution/engine/http.js.map +1 -1
- package/lib/execution/engine/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 +25 -3
- package/lib/execution/engine/mock.js.map +1 -1
- package/lib/execution/engine/payloadIdCache.d.ts +4 -1
- package/lib/execution/engine/payloadIdCache.d.ts.map +1 -1
- package/lib/execution/engine/payloadIdCache.js +13 -2
- package/lib/execution/engine/payloadIdCache.js.map +1 -1
- package/lib/execution/engine/restTransport.d.ts +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/transport.d.ts +5 -2
- package/lib/execution/engine/transport.d.ts.map +1 -1
- package/lib/execution/engine/types.d.ts +24 -0
- package/lib/execution/engine/types.d.ts.map +1 -1
- package/lib/execution/engine/types.js +12 -0
- 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 +16 -0
- package/lib/metrics/metrics/lodestar.d.ts.map +1 -1
- package/lib/metrics/metrics/lodestar.js +44 -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 +8 -0
- package/lib/network/gossip/topic.d.ts.map +1 -1
- package/lib/network/gossip/topic.js +13 -1
- package/lib/network/gossip/topic.js.map +1 -1
- package/lib/network/interface.d.ts +2 -1
- package/lib/network/interface.d.ts.map +1 -1
- package/lib/network/network.d.ts +2 -1
- package/lib/network/network.d.ts.map +1 -1
- package/lib/network/network.js +5 -0
- package/lib/network/network.js.map +1 -1
- package/lib/network/peers/utils/enrSubnetsDeserialize.d.ts.map +1 -1
- package/lib/network/peers/utils/enrSubnetsDeserialize.js +5 -2
- package/lib/network/peers/utils/enrSubnetsDeserialize.js.map +1 -1
- package/lib/network/processor/gossipHandlers.d.ts.map +1 -1
- package/lib/network/processor/gossipHandlers.js +40 -1
- package/lib/network/processor/gossipHandlers.js.map +1 -1
- package/lib/network/processor/gossipQueues/index.d.ts.map +1 -1
- package/lib/network/processor/gossipQueues/index.js +6 -0
- package/lib/network/processor/gossipQueues/index.js.map +1 -1
- package/lib/network/processor/gossipValidatorFn.d.ts.map +1 -1
- package/lib/network/processor/gossipValidatorFn.js +5 -1
- package/lib/network/processor/gossipValidatorFn.js.map +1 -1
- package/lib/network/processor/index.d.ts +5 -0
- package/lib/network/processor/index.d.ts.map +1 -1
- package/lib/network/processor/index.js +11 -1
- 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/package.json +15 -15
- package/src/api/impl/debug/index.ts +4 -0
- package/src/api/impl/validator/index.ts +125 -3
- package/src/chain/ColumnReconstructionTracker.ts +60 -41
- package/src/chain/blocks/importBlock.ts +3 -7
- package/src/chain/blocks/importExecutionPayload.ts +67 -2
- package/src/chain/blocks/types.ts +5 -0
- package/src/chain/chain.ts +5 -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 -18
- package/src/chain/regen/interface.ts +1 -0
- package/src/chain/validation/executionPayloadBid.ts +52 -2
- package/src/chain/validation/inclusionList.ts +183 -0
- package/src/chain/validation/index.ts +1 -0
- package/src/execution/builder/validateBid.ts +23 -2
- package/src/execution/engine/disabled.ts +4 -0
- package/src/execution/engine/http.ts +41 -5
- package/src/execution/engine/interface.ts +27 -3
- package/src/execution/engine/jsonRpcTransport.ts +46 -9
- package/src/execution/engine/mock.ts +26 -3
- package/src/execution/engine/payloadIdCache.ts +23 -4
- package/src/execution/engine/restTransport.ts +15 -1
- package/src/execution/engine/transport.ts +7 -2
- package/src/execution/engine/types.ts +35 -0
- package/src/metrics/metrics/beacon.ts +37 -0
- package/src/metrics/metrics/lodestar.ts +46 -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/peers/utils/enrSubnetsDeserialize.ts +5 -2
- package/src/network/processor/gossipHandlers.ts +52 -1
- package/src/network/processor/gossipQueues/index.ts +6 -0
- package/src/network/processor/gossipValidatorFn.ts +5 -0
- package/src/network/processor/index.ts +11 -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
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import {ForkName, ForkSeq} from "@lodestar/params";
|
|
2
|
-
import {ExecutionPayload, ExecutionRequests, Root, RootHex} from "@lodestar/types";
|
|
2
|
+
import {ExecutionPayload, ExecutionRequests, Root, RootHex, bellatrix} from "@lodestar/types";
|
|
3
3
|
import {BlobAndProof} from "@lodestar/types/deneb";
|
|
4
4
|
import {BlobAndProofV2} from "@lodestar/types/fulu";
|
|
5
5
|
import {strip0xPrefix} from "@lodestar/utils";
|
|
@@ -16,10 +16,12 @@ import {
|
|
|
16
16
|
deserializeBlobAndProofsV2,
|
|
17
17
|
deserializeBlobAndProofsV2IntoBytes,
|
|
18
18
|
deserializeExecutionPayloadBodyV2,
|
|
19
|
+
deserializeInclusionList,
|
|
19
20
|
parseExecutionPayload,
|
|
20
21
|
serializeBeaconBlockRoot,
|
|
21
22
|
serializeExecutionPayload,
|
|
22
23
|
serializeExecutionRequests,
|
|
24
|
+
serializeInclusionList,
|
|
23
25
|
serializePayloadAttributes,
|
|
24
26
|
serializeVersionedHashes,
|
|
25
27
|
} from "./types.js";
|
|
@@ -40,6 +42,7 @@ const getPayloadBodiesByHashOpts: ReqOpts = {routeId: "getPayloadBodiesByHash"};
|
|
|
40
42
|
const getBlobsV1Opts: ReqOpts = {routeId: "getBlobsV1"};
|
|
41
43
|
const getBlobsV2Opts: ReqOpts = {routeId: "getBlobsV2"};
|
|
42
44
|
const getClientVersionOpts: ReqOpts = {routeId: "getClientVersion"};
|
|
45
|
+
const getInclusionListOpts: ReqOpts = {routeId: "getInclusionList"};
|
|
43
46
|
|
|
44
47
|
/**
|
|
45
48
|
* Legacy `engine_*` JSON-RPC methods
|
|
@@ -57,7 +60,8 @@ export class JsonRpcEngineTransport implements IEngineTransport {
|
|
|
57
60
|
executionPayload: ExecutionPayload,
|
|
58
61
|
versionedHashes?: VersionedHashes,
|
|
59
62
|
parentBeaconBlockRoot?: Root,
|
|
60
|
-
executionRequests?: ExecutionRequests
|
|
63
|
+
executionRequests?: ExecutionRequests,
|
|
64
|
+
inclusionListTransactions?: bellatrix.Transactions
|
|
61
65
|
): Promise<PayloadStatusResult> {
|
|
62
66
|
const serializedExecutionPayload = serializeExecutionPayload(fork, executionPayload);
|
|
63
67
|
|
|
@@ -76,6 +80,28 @@ export class JsonRpcEngineTransport implements IEngineTransport {
|
|
|
76
80
|
if (executionRequests === undefined) {
|
|
77
81
|
throw Error(`executionRequests required in notifyNewPayload for fork=${fork}`);
|
|
78
82
|
}
|
|
83
|
+
if (ForkSeq[fork] >= ForkSeq.heze) {
|
|
84
|
+
if (inclusionListTransactions === undefined) {
|
|
85
|
+
throw Error(`inclusionListTransactions required in notifyNewPayload for fork=${fork}`);
|
|
86
|
+
}
|
|
87
|
+
const method = "engine_newPayloadV6";
|
|
88
|
+
return this.rpc.fetchWithRetries<
|
|
89
|
+
EngineApiRpcReturnTypes[typeof method],
|
|
90
|
+
EngineApiRpcParamTypes[typeof method]
|
|
91
|
+
>(
|
|
92
|
+
{
|
|
93
|
+
method,
|
|
94
|
+
params: [
|
|
95
|
+
serializedExecutionPayload,
|
|
96
|
+
serializedVersionedHashes,
|
|
97
|
+
serializedParentBeaconBlockRoot,
|
|
98
|
+
serializeExecutionRequests(fork, executionRequests),
|
|
99
|
+
serializeInclusionList(inclusionListTransactions),
|
|
100
|
+
],
|
|
101
|
+
},
|
|
102
|
+
notifyNewPayloadOpts
|
|
103
|
+
);
|
|
104
|
+
}
|
|
79
105
|
const method = ForkSeq[fork] >= ForkSeq.gloas ? "engine_newPayloadV5" : "engine_newPayloadV4";
|
|
80
106
|
return this.rpc.fetchWithRetries<EngineApiRpcReturnTypes[typeof method], EngineApiRpcParamTypes[typeof method]>(
|
|
81
107
|
{
|
|
@@ -113,13 +139,15 @@ export class JsonRpcEngineTransport implements IEngineTransport {
|
|
|
113
139
|
payloadAttributes?: PayloadAttributes
|
|
114
140
|
): Promise<ForkchoiceUpdatedResult> {
|
|
115
141
|
const method =
|
|
116
|
-
ForkSeq[fork] >= ForkSeq.
|
|
117
|
-
? "
|
|
118
|
-
: ForkSeq[fork] >= ForkSeq.
|
|
119
|
-
? "
|
|
120
|
-
: ForkSeq[fork] >= ForkSeq.
|
|
121
|
-
? "
|
|
122
|
-
:
|
|
142
|
+
ForkSeq[fork] >= ForkSeq.heze
|
|
143
|
+
? "engine_forkchoiceUpdatedV5"
|
|
144
|
+
: ForkSeq[fork] >= ForkSeq.gloas
|
|
145
|
+
? "engine_forkchoiceUpdatedV4"
|
|
146
|
+
: ForkSeq[fork] >= ForkSeq.deneb
|
|
147
|
+
? "engine_forkchoiceUpdatedV3"
|
|
148
|
+
: ForkSeq[fork] >= ForkSeq.capella
|
|
149
|
+
? "engine_forkchoiceUpdatedV2"
|
|
150
|
+
: "engine_forkchoiceUpdatedV1";
|
|
123
151
|
const payloadAttributesRpc = payloadAttributes ? serializePayloadAttributes(payloadAttributes) : undefined;
|
|
124
152
|
// If we are just fcUing and not asking execution for payload, retry is not required
|
|
125
153
|
// and we can move on, as the next fcU will be issued soon on the new slot
|
|
@@ -244,4 +272,13 @@ export class JsonRpcEngineTransport implements IEngineTransport {
|
|
|
244
272
|
return {code, name: cv.name, version: cv.version, commit: strip0xPrefix(cv.commit)};
|
|
245
273
|
});
|
|
246
274
|
}
|
|
275
|
+
|
|
276
|
+
async getInclusionList(): Promise<bellatrix.Transactions> {
|
|
277
|
+
const method = "engine_getInclusionListV1";
|
|
278
|
+
const response = await this.rpc.fetchWithRetries<
|
|
279
|
+
EngineApiRpcReturnTypes[typeof method],
|
|
280
|
+
EngineApiRpcParamTypes[typeof method]
|
|
281
|
+
>({method, params: []}, getInclusionListOpts);
|
|
282
|
+
return deserializeInclusionList(response);
|
|
283
|
+
}
|
|
247
284
|
}
|
|
@@ -137,10 +137,12 @@ export class ExecutionEngineMockBackend implements JsonRpcBackend {
|
|
|
137
137
|
engine_newPayloadV3: this.notifyNewPayload.bind(this),
|
|
138
138
|
engine_newPayloadV4: this.notifyNewPayload.bind(this),
|
|
139
139
|
engine_newPayloadV5: this.notifyNewPayload.bind(this),
|
|
140
|
+
engine_newPayloadV6: this.notifyNewPayload.bind(this),
|
|
140
141
|
engine_forkchoiceUpdatedV1: this.notifyForkchoiceUpdate.bind(this),
|
|
141
142
|
engine_forkchoiceUpdatedV2: this.notifyForkchoiceUpdate.bind(this),
|
|
142
143
|
engine_forkchoiceUpdatedV3: this.notifyForkchoiceUpdate.bind(this),
|
|
143
144
|
engine_forkchoiceUpdatedV4: this.notifyForkchoiceUpdate.bind(this),
|
|
145
|
+
engine_forkchoiceUpdatedV5: this.notifyForkchoiceUpdate.bind(this),
|
|
144
146
|
engine_getPayloadV1: this.getPayloadV1.bind(this),
|
|
145
147
|
engine_getPayloadV2: this.getPayloadV5.bind(this),
|
|
146
148
|
engine_getPayloadV3: this.getPayloadV5.bind(this),
|
|
@@ -151,6 +153,7 @@ export class ExecutionEngineMockBackend implements JsonRpcBackend {
|
|
|
151
153
|
engine_getClientVersionV1: this.getClientVersionV1.bind(this),
|
|
152
154
|
engine_getBlobsV1: this.getBlobs.bind(this),
|
|
153
155
|
engine_getBlobsV2: this.getBlobsV2.bind(this),
|
|
156
|
+
engine_getInclusionListV1: this.getInclusionList.bind(this),
|
|
154
157
|
};
|
|
155
158
|
}
|
|
156
159
|
|
|
@@ -234,7 +237,13 @@ export class ExecutionEngineMockBackend implements JsonRpcBackend {
|
|
|
234
237
|
// IF the payload has been fully validated while processing the call
|
|
235
238
|
// RETURN payload status from the Payload validation process
|
|
236
239
|
// If validation succeeds, the response MUST contain {status: VALID, latestValidHash: payload.blockHash}
|
|
237
|
-
|
|
240
|
+
// The mock does not check inclusion list constraints, so every payload satisfies them (PayloadStatusV2)
|
|
241
|
+
return {
|
|
242
|
+
status: ExecutionPayloadStatus.VALID,
|
|
243
|
+
latestValidHash: blockHash,
|
|
244
|
+
validationError: null,
|
|
245
|
+
inclusionListSatisfied: true,
|
|
246
|
+
};
|
|
238
247
|
}
|
|
239
248
|
|
|
240
249
|
/**
|
|
@@ -409,7 +418,12 @@ export class ExecutionEngineMockBackend implements JsonRpcBackend {
|
|
|
409
418
|
// IF the payload is deemed VALID and the build process has begun
|
|
410
419
|
// {payloadStatus: {status: VALID, latestValidHash: forkchoiceState.headBlockHash, validationError: null}, payloadId: buildProcessId}
|
|
411
420
|
return {
|
|
412
|
-
payloadStatus: {
|
|
421
|
+
payloadStatus: {
|
|
422
|
+
status: ExecutionPayloadStatus.VALID,
|
|
423
|
+
latestValidHash: null,
|
|
424
|
+
validationError: null,
|
|
425
|
+
inclusionListSatisfied: true,
|
|
426
|
+
},
|
|
413
427
|
payloadId: String(payloadId as number),
|
|
414
428
|
};
|
|
415
429
|
}
|
|
@@ -418,7 +432,12 @@ export class ExecutionEngineMockBackend implements JsonRpcBackend {
|
|
|
418
432
|
// IF the payload is deemed VALID and a build process hasn't been started
|
|
419
433
|
// {payloadStatus: {status: VALID, latestValidHash: forkchoiceState.headBlockHash, validationError: null}, payloadId: null}
|
|
420
434
|
return {
|
|
421
|
-
payloadStatus: {
|
|
435
|
+
payloadStatus: {
|
|
436
|
+
status: ExecutionPayloadStatus.VALID,
|
|
437
|
+
latestValidHash: null,
|
|
438
|
+
validationError: null,
|
|
439
|
+
inclusionListSatisfied: true,
|
|
440
|
+
},
|
|
422
441
|
payloadId: null,
|
|
423
442
|
};
|
|
424
443
|
}
|
|
@@ -487,6 +506,10 @@ export class ExecutionEngineMockBackend implements JsonRpcBackend {
|
|
|
487
506
|
return null;
|
|
488
507
|
}
|
|
489
508
|
|
|
509
|
+
private getInclusionList(): EngineApiRpcReturnTypes["engine_getInclusionListV1"] {
|
|
510
|
+
return [];
|
|
511
|
+
}
|
|
512
|
+
|
|
490
513
|
private timestampToFork(timestamp: number): ForkPostBellatrix {
|
|
491
514
|
if (timestamp >= this.gloasForkTimestamp) return ForkName.gloas;
|
|
492
515
|
if (timestamp >= this.fuluForkTimestamp) return ForkName.fulu;
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import {byteArrayEquals} from "@chainsafe/ssz";
|
|
1
2
|
import {SLOTS_PER_EPOCH} from "@lodestar/params";
|
|
3
|
+
import {bellatrix} from "@lodestar/types";
|
|
2
4
|
import {pruneSetToMax} from "@lodestar/utils";
|
|
3
5
|
import {PayloadAttributesRpc} from "./types.js";
|
|
4
6
|
import {DATA, QUANTITY} from "./utils.js";
|
|
@@ -17,10 +19,16 @@ export type WithdrawalV1 = {
|
|
|
17
19
|
amount: QUANTITY;
|
|
18
20
|
};
|
|
19
21
|
|
|
20
|
-
type FcuAttributes = {headBlockHash: DATA; finalizedBlockHash: DATA} & Omit<
|
|
22
|
+
type FcuAttributes = {headBlockHash: DATA; finalizedBlockHash: DATA} & Omit<
|
|
23
|
+
PayloadAttributesRpc,
|
|
24
|
+
"withdrawals" | "inclusionListTransactions"
|
|
25
|
+
> & {inclusionListTransactions?: bellatrix.Transactions};
|
|
21
26
|
|
|
22
27
|
export class PayloadIdCache {
|
|
23
|
-
private readonly payloadIdByFcuAttributes = new Map<
|
|
28
|
+
private readonly payloadIdByFcuAttributes = new Map<
|
|
29
|
+
string,
|
|
30
|
+
{payloadId: PayloadId; fullKey: string; inclusionListTransactions?: bellatrix.Transactions}
|
|
31
|
+
>();
|
|
24
32
|
|
|
25
33
|
getFullKey({headBlockHash, finalizedBlockHash, timestamp, prevRandao, suggestedFeeRecipient}: FcuAttributes): string {
|
|
26
34
|
return `${headBlockHash}-${finalizedBlockHash}-${timestamp}-${prevRandao}-${suggestedFeeRecipient}`;
|
|
@@ -37,7 +45,8 @@ export class PayloadIdCache {
|
|
|
37
45
|
add(fcuAttributes: FcuAttributes, payloadId: PayloadId): void {
|
|
38
46
|
const key = this.getKey(fcuAttributes);
|
|
39
47
|
const fullKey = this.getFullKey(fcuAttributes);
|
|
40
|
-
|
|
48
|
+
const {inclusionListTransactions} = fcuAttributes;
|
|
49
|
+
this.payloadIdByFcuAttributes.set(key, {payloadId, fullKey, inclusionListTransactions});
|
|
41
50
|
}
|
|
42
51
|
|
|
43
52
|
prune(): void {
|
|
@@ -49,6 +58,16 @@ export class PayloadIdCache {
|
|
|
49
58
|
const key = this.getKey(fcuAttributes);
|
|
50
59
|
const fullKey = this.getFullKey(fcuAttributes);
|
|
51
60
|
const payloadInfo = this.payloadIdByFcuAttributes.get(key);
|
|
52
|
-
return payloadInfo?.fullKey === fullKey
|
|
61
|
+
return payloadInfo?.fullKey === fullKey &&
|
|
62
|
+
isSameInclusionList(payloadInfo.inclusionListTransactions, fcuAttributes.inclusionListTransactions)
|
|
63
|
+
? payloadInfo.payloadId
|
|
64
|
+
: undefined;
|
|
53
65
|
}
|
|
54
66
|
}
|
|
67
|
+
|
|
68
|
+
function isSameInclusionList(a?: bellatrix.Transactions, b?: bellatrix.Transactions): boolean {
|
|
69
|
+
if (a === undefined || b === undefined) {
|
|
70
|
+
return a === b;
|
|
71
|
+
}
|
|
72
|
+
return a.length === b.length && a.every((transaction, i) => byteArrayEquals(transaction, b[i]));
|
|
73
|
+
}
|
|
@@ -1,6 +1,16 @@
|
|
|
1
1
|
import {Type} from "@chainsafe/ssz";
|
|
2
2
|
import {CELLS_PER_EXT_BLOB, ForkName, ForkSeq, isForkPostBellatrix} from "@lodestar/params";
|
|
3
|
-
import {
|
|
3
|
+
import {
|
|
4
|
+
ExecutionPayload,
|
|
5
|
+
ExecutionRequests,
|
|
6
|
+
Root,
|
|
7
|
+
RootHex,
|
|
8
|
+
bellatrix,
|
|
9
|
+
capella,
|
|
10
|
+
deneb,
|
|
11
|
+
electra,
|
|
12
|
+
gloas,
|
|
13
|
+
} from "@lodestar/types";
|
|
4
14
|
import {BlobAndProof} from "@lodestar/types/deneb";
|
|
5
15
|
import {BlobAndProofV2} from "@lodestar/types/fulu";
|
|
6
16
|
import {EndTimer, LodestarError, fromHex, strip0xPrefix, toHex, toRootHex} from "@lodestar/utils";
|
|
@@ -454,6 +464,10 @@ export class RestEngineTransport implements IEngineTransport {
|
|
|
454
464
|
};
|
|
455
465
|
});
|
|
456
466
|
}
|
|
467
|
+
|
|
468
|
+
getInclusionList(): Promise<bellatrix.Transactions> {
|
|
469
|
+
throw Error("engine_getInclusionListV1 is not available over the REST engine API");
|
|
470
|
+
}
|
|
457
471
|
}
|
|
458
472
|
|
|
459
473
|
function toPayloadAttributesBellatrix(attributes: PayloadAttributes) {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import {ForkName} from "@lodestar/params";
|
|
2
|
-
import {BlobsBundle, ExecutionPayload, ExecutionRequests, Root, RootHex, Wei} from "@lodestar/types";
|
|
2
|
+
import {BlobsBundle, ExecutionPayload, ExecutionRequests, Root, RootHex, Wei, bellatrix} from "@lodestar/types";
|
|
3
3
|
import {BlobAndProof} from "@lodestar/types/deneb";
|
|
4
4
|
import {BlobAndProofV2} from "@lodestar/types/fulu";
|
|
5
5
|
import {ClientVersion, ExecutionPayloadStatus, PayloadAttributes, PayloadId, VersionedHashes} from "./interface.js";
|
|
@@ -10,6 +10,8 @@ export type PayloadStatusResult = {
|
|
|
10
10
|
status: ExecutionPayloadStatus;
|
|
11
11
|
latestValidHash: RootHex | null;
|
|
12
12
|
validationError: string | null;
|
|
13
|
+
/** PayloadStatusV2: whether a VALID payload satisfied the inclusion list constraints, null otherwise */
|
|
14
|
+
inclusionListSatisfied?: boolean | null;
|
|
13
15
|
};
|
|
14
16
|
|
|
15
17
|
export type ForkchoiceUpdatedResult = {
|
|
@@ -38,7 +40,8 @@ export interface IEngineTransport {
|
|
|
38
40
|
executionPayload: ExecutionPayload,
|
|
39
41
|
versionedHashes?: VersionedHashes,
|
|
40
42
|
parentBeaconBlockRoot?: Root,
|
|
41
|
-
executionRequests?: ExecutionRequests
|
|
43
|
+
executionRequests?: ExecutionRequests,
|
|
44
|
+
inclusionListTransactions?: bellatrix.Transactions
|
|
42
45
|
): Promise<PayloadStatusResult>;
|
|
43
46
|
|
|
44
47
|
forkchoiceUpdated(
|
|
@@ -58,4 +61,6 @@ export interface IEngineTransport {
|
|
|
58
61
|
getBlobsV2(versionedHashes: VersionedHashes, buffers?: Uint8Array[]): Promise<BlobAndProofV2[] | null>;
|
|
59
62
|
|
|
60
63
|
getClientVersion(clientVersion: ClientVersion): Promise<ClientVersion[]>;
|
|
64
|
+
|
|
65
|
+
getInclusionList(): Promise<bellatrix.Transactions>;
|
|
61
66
|
}
|
|
@@ -54,6 +54,7 @@ export type EngineApiRpcParamTypes = {
|
|
|
54
54
|
engine_newPayloadV3: [ExecutionPayloadRpc, VersionedHashesRpc, DATA];
|
|
55
55
|
engine_newPayloadV4: [ExecutionPayloadRpc, VersionedHashesRpc, DATA, ExecutionRequestsRpc];
|
|
56
56
|
engine_newPayloadV5: [ExecutionPayloadRpc, VersionedHashesRpc, DATA, ExecutionRequestsRpc];
|
|
57
|
+
engine_newPayloadV6: [ExecutionPayloadRpc, VersionedHashesRpc, DATA, ExecutionRequestsRpc, InclusionListRpc];
|
|
57
58
|
/**
|
|
58
59
|
* 1. Object - Payload validity status with respect to the consensus rules:
|
|
59
60
|
* - blockHash: DATA, 32 Bytes - block hash value of the payload
|
|
@@ -75,6 +76,10 @@ export type EngineApiRpcParamTypes = {
|
|
|
75
76
|
forkChoiceData: {headBlockHash: DATA; safeBlockHash: DATA; finalizedBlockHash: DATA},
|
|
76
77
|
payloadAttributes?: PayloadAttributesRpc,
|
|
77
78
|
];
|
|
79
|
+
engine_forkchoiceUpdatedV5: [
|
|
80
|
+
forkChoiceData: {headBlockHash: DATA; safeBlockHash: DATA; finalizedBlockHash: DATA},
|
|
81
|
+
payloadAttributes?: PayloadAttributesRpc,
|
|
82
|
+
];
|
|
78
83
|
/**
|
|
79
84
|
* 1. payloadId: QUANTITY, 64 Bits - Identifier of the payload building process
|
|
80
85
|
*/
|
|
@@ -97,12 +102,16 @@ export type EngineApiRpcParamTypes = {
|
|
|
97
102
|
|
|
98
103
|
engine_getBlobsV1: [DATA[]];
|
|
99
104
|
engine_getBlobsV2: [DATA[]];
|
|
105
|
+
|
|
106
|
+
engine_getInclusionListV1: [];
|
|
100
107
|
};
|
|
101
108
|
|
|
102
109
|
export type PayloadStatus = {
|
|
103
110
|
status: ExecutionPayloadStatus;
|
|
104
111
|
latestValidHash: DATA | null;
|
|
105
112
|
validationError: string | null;
|
|
113
|
+
/** PayloadStatusV2: whether a VALID payload satisfied the inclusion list constraints, null otherwise */
|
|
114
|
+
inclusionListSatisfied?: boolean | null;
|
|
106
115
|
};
|
|
107
116
|
|
|
108
117
|
export type EngineApiRpcReturnTypes = {
|
|
@@ -115,6 +124,7 @@ export type EngineApiRpcReturnTypes = {
|
|
|
115
124
|
engine_newPayloadV3: PayloadStatus;
|
|
116
125
|
engine_newPayloadV4: PayloadStatus;
|
|
117
126
|
engine_newPayloadV5: PayloadStatus;
|
|
127
|
+
engine_newPayloadV6: PayloadStatus;
|
|
118
128
|
engine_forkchoiceUpdatedV1: {
|
|
119
129
|
payloadStatus: PayloadStatus;
|
|
120
130
|
payloadId: QUANTITY | null;
|
|
@@ -131,6 +141,10 @@ export type EngineApiRpcReturnTypes = {
|
|
|
131
141
|
payloadStatus: PayloadStatus;
|
|
132
142
|
payloadId: QUANTITY | null;
|
|
133
143
|
};
|
|
144
|
+
engine_forkchoiceUpdatedV5: {
|
|
145
|
+
payloadStatus: PayloadStatus;
|
|
146
|
+
payloadId: QUANTITY | null;
|
|
147
|
+
};
|
|
134
148
|
/**
|
|
135
149
|
* payloadId | Error: QUANTITY, 64 Bits - Identifier of the payload building process
|
|
136
150
|
*/
|
|
@@ -147,6 +161,8 @@ export type EngineApiRpcReturnTypes = {
|
|
|
147
161
|
|
|
148
162
|
engine_getBlobsV1: (BlobAndProofRpc | null)[];
|
|
149
163
|
engine_getBlobsV2: BlobAndProofV2Rpc[] | null;
|
|
164
|
+
|
|
165
|
+
engine_getInclusionListV1: InclusionListRpc;
|
|
150
166
|
};
|
|
151
167
|
|
|
152
168
|
type ExecutionPayloadRpcWithValue = {
|
|
@@ -261,8 +277,13 @@ export type PayloadAttributesRpc = {
|
|
|
261
277
|
slotNumber?: QUANTITY;
|
|
262
278
|
/** QUANTITY, 64 Bits - target value for the gasLimit field of the new payload (GLOAS, execution-apis#796) */
|
|
263
279
|
targetGasLimit?: QUANTITY;
|
|
280
|
+
/** Array of DATA - transactions that the built payload must include (PayloadAttributesV5, HEZE) */
|
|
281
|
+
inclusionListTransactions?: InclusionListRpc;
|
|
264
282
|
};
|
|
265
283
|
|
|
284
|
+
/** Array of DATA - array of transaction objects */
|
|
285
|
+
export type InclusionListRpc = DATA[];
|
|
286
|
+
|
|
266
287
|
export type ClientVersionRpc = {
|
|
267
288
|
/** ClientCode */
|
|
268
289
|
code: string;
|
|
@@ -442,6 +463,9 @@ export function serializePayloadAttributes(data: PayloadAttributes): PayloadAttr
|
|
|
442
463
|
parentBeaconBlockRoot: data.parentBeaconBlockRoot ? bytesToData(data.parentBeaconBlockRoot) : undefined,
|
|
443
464
|
slotNumber: data.slotNumber !== undefined ? numToQuantity(data.slotNumber) : undefined,
|
|
444
465
|
targetGasLimit: data.targetGasLimit !== undefined ? numToQuantity(data.targetGasLimit) : undefined,
|
|
466
|
+
inclusionListTransactions: data.inclusionListTransactions
|
|
467
|
+
? serializeInclusionList(data.inclusionListTransactions)
|
|
468
|
+
: undefined,
|
|
445
469
|
};
|
|
446
470
|
}
|
|
447
471
|
|
|
@@ -449,6 +473,14 @@ export function serializeBeaconBlockRoot(data: Root): DATA {
|
|
|
449
473
|
return bytesToData(data);
|
|
450
474
|
}
|
|
451
475
|
|
|
476
|
+
export function serializeInclusionList(data: bellatrix.Transactions): InclusionListRpc {
|
|
477
|
+
return data.map((transaction) => bytesToData(transaction));
|
|
478
|
+
}
|
|
479
|
+
|
|
480
|
+
export function deserializeInclusionList(data: InclusionListRpc): bellatrix.Transactions {
|
|
481
|
+
return data.map((transaction) => dataToBytes(transaction, null));
|
|
482
|
+
}
|
|
483
|
+
|
|
452
484
|
export function deserializePayloadAttributes(data: PayloadAttributesRpc): PayloadAttributes {
|
|
453
485
|
return {
|
|
454
486
|
timestamp: quantityToNum(data.timestamp),
|
|
@@ -460,6 +492,9 @@ export function deserializePayloadAttributes(data: PayloadAttributesRpc): Payloa
|
|
|
460
492
|
parentBeaconBlockRoot: data.parentBeaconBlockRoot ? dataToBytes(data.parentBeaconBlockRoot, 32) : undefined,
|
|
461
493
|
slotNumber: data.slotNumber !== undefined ? quantityToNum(data.slotNumber) : undefined,
|
|
462
494
|
targetGasLimit: data.targetGasLimit !== undefined ? quantityToBigint(data.targetGasLimit) : undefined,
|
|
495
|
+
inclusionListTransactions: data.inclusionListTransactions
|
|
496
|
+
? deserializeInclusionList(data.inclusionListTransactions)
|
|
497
|
+
: undefined,
|
|
463
498
|
};
|
|
464
499
|
}
|
|
465
500
|
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import {ProducedBlockSource} from "@lodestar/types";
|
|
2
2
|
import {BlockSelectionResult} from "../../api/impl/validator/index.js";
|
|
3
|
+
import {InclusionListSource} from "../../chain/blocks/types.js";
|
|
3
4
|
import {BlockProductionStep, PayloadPreparationType} from "../../chain/produceBlock/index.js";
|
|
4
5
|
import {RegistryMetricCreator} from "../utils/registryMetricCreator.js";
|
|
5
6
|
|
|
@@ -432,5 +433,41 @@ export function createBeaconMetrics(register: RegistryMetricCreator) {
|
|
|
432
433
|
name: "beacon_weak_head_detected_total",
|
|
433
434
|
help: "Detected current head block is weak. May reorg it out when proposing next slot. See proposer boost reorg for more",
|
|
434
435
|
}),
|
|
436
|
+
|
|
437
|
+
// HEZE:EIP-7805
|
|
438
|
+
inclusionListsReceived: register.counter<{source: InclusionListSource}>({
|
|
439
|
+
name: "beacon_inclusion_lists_received_total",
|
|
440
|
+
help: "Total number of received inclusion lists",
|
|
441
|
+
labelNames: ["source"],
|
|
442
|
+
}),
|
|
443
|
+
inclusionListsValid: register.counter<{source: InclusionListSource}>({
|
|
444
|
+
name: "beacon_inclusion_lists_valid_total",
|
|
445
|
+
help: "Total number of valid inclusion lists",
|
|
446
|
+
labelNames: ["source"],
|
|
447
|
+
}),
|
|
448
|
+
inclusionListsValidSize: register.counter({
|
|
449
|
+
name: "beacon_inclusion_lists_valid_size_bytes_total",
|
|
450
|
+
help: "Total size of valid inclusion lists in bytes",
|
|
451
|
+
}),
|
|
452
|
+
inclusionListTransactionsReceived: register.counter<{source: InclusionListSource}>({
|
|
453
|
+
name: "beacon_inclusion_list_transactions_received_total",
|
|
454
|
+
help: "Total number of transactions in received inclusion lists",
|
|
455
|
+
labelNames: ["source"],
|
|
456
|
+
}),
|
|
457
|
+
inclusionListsPublished: register.counter({
|
|
458
|
+
name: "beacon_inclusion_lists_published_total",
|
|
459
|
+
help: "Total number of published inclusion lists",
|
|
460
|
+
}),
|
|
461
|
+
inclusionListsValidationTime: register.histogram<{source: InclusionListSource}>({
|
|
462
|
+
name: "beacon_inclusion_lists_validation_time_seconds",
|
|
463
|
+
help: "Time taken to validate inclusion lists",
|
|
464
|
+
buckets: [0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5],
|
|
465
|
+
labelNames: ["source"],
|
|
466
|
+
}),
|
|
467
|
+
inclusionListArrivalTime: register.histogram({
|
|
468
|
+
name: "beacon_inclusion_lists_arrival_time_seconds",
|
|
469
|
+
help: "Inclusion list arrival time since the beginning of slot",
|
|
470
|
+
buckets: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11],
|
|
471
|
+
}),
|
|
435
472
|
};
|
|
436
473
|
}
|
|
@@ -16,6 +16,7 @@ import {
|
|
|
16
16
|
type InvalidAttestationData,
|
|
17
17
|
ScannedSlotsTerminationReason,
|
|
18
18
|
} from "../../chain/opPools/aggregatedAttestationPool.js";
|
|
19
|
+
import {InclusionListInsertOutcome} from "../../chain/opPools/inclusionListStore.js";
|
|
19
20
|
import {InsertOutcome} from "../../chain/opPools/types.js";
|
|
20
21
|
import {RegenCaller, RegenFnName} from "../../chain/regen/interface.js";
|
|
21
22
|
import {ReprocessStatus} from "../../chain/reprocess.js";
|
|
@@ -330,6 +331,31 @@ export function createLodestarMetrics(
|
|
|
330
331
|
}),
|
|
331
332
|
},
|
|
332
333
|
|
|
334
|
+
columnReconstructionQueue: {
|
|
335
|
+
length: register.gauge({
|
|
336
|
+
name: "lodestar_column_reconstruction_queue_length",
|
|
337
|
+
help: "Count of total column reconstruction queue length",
|
|
338
|
+
}),
|
|
339
|
+
droppedJobs: register.gauge({
|
|
340
|
+
name: "lodestar_column_reconstruction_queue_dropped_jobs_total",
|
|
341
|
+
help: "Count of total column reconstruction queue dropped jobs",
|
|
342
|
+
}),
|
|
343
|
+
jobTime: register.histogram({
|
|
344
|
+
name: "lodestar_column_reconstruction_queue_job_time_seconds",
|
|
345
|
+
help: "Time to process column reconstruction queue job in seconds",
|
|
346
|
+
buckets: [0.01, 0.1, 1, 4, 12],
|
|
347
|
+
}),
|
|
348
|
+
jobWaitTime: register.histogram({
|
|
349
|
+
name: "lodestar_column_reconstruction_queue_job_wait_time_seconds",
|
|
350
|
+
help: "Time from job added to the column reconstruction queue to starting in seconds",
|
|
351
|
+
buckets: [0.01, 0.1, 1, 4, 12],
|
|
352
|
+
}),
|
|
353
|
+
concurrency: register.gauge({
|
|
354
|
+
name: "lodestar_column_reconstruction_queue_concurrency",
|
|
355
|
+
help: "Current concurrency of column reconstruction queue",
|
|
356
|
+
}),
|
|
357
|
+
},
|
|
358
|
+
|
|
333
359
|
engineHttpProcessorQueue: {
|
|
334
360
|
length: register.gauge({
|
|
335
361
|
name: "lodestar_engine_http_processor_queue_length",
|
|
@@ -1177,11 +1203,31 @@ export function createLodestarMetrics(
|
|
|
1177
1203
|
help: "The total result of calling notifyForkchoiceUpdate execution engine api",
|
|
1178
1204
|
labelNames: ["result"],
|
|
1179
1205
|
}),
|
|
1206
|
+
getInclusionListV1Requests: register.counter({
|
|
1207
|
+
name: "lodestar_execution_engine_get_inclusion_list_v1_requests_total",
|
|
1208
|
+
help: "Total number of engine_getInclusionListV1 requests",
|
|
1209
|
+
}),
|
|
1210
|
+
getInclusionListV1RequestsDuration: register.histogram({
|
|
1211
|
+
name: "lodestar_execution_engine_get_inclusion_list_v1_duration_seconds",
|
|
1212
|
+
help: "Duration of engine_getInclusionListV1 requests",
|
|
1213
|
+
buckets: [0.05, 0.1, 0.25, 0.5, 1],
|
|
1214
|
+
}),
|
|
1180
1215
|
engineApiRequests: register.counter<{transport: string}>({
|
|
1181
1216
|
name: "lodestar_execution_engine_api_requests_total",
|
|
1182
1217
|
help: "Total engine API requests by transport",
|
|
1183
1218
|
labelNames: ["transport"],
|
|
1184
1219
|
}),
|
|
1220
|
+
inclusionListStore: {
|
|
1221
|
+
size: register.gauge({
|
|
1222
|
+
name: "lodestar_inclusion_list_store_size",
|
|
1223
|
+
help: "Current number of inclusion lists retained in the InclusionListStore",
|
|
1224
|
+
}),
|
|
1225
|
+
insertOutcome: register.counter<{insertOutcome: InclusionListInsertOutcome}>({
|
|
1226
|
+
name: "lodestar_inclusion_list_store_insert_outcome_total",
|
|
1227
|
+
help: "Total number of InclusionListStore insertions by outcome",
|
|
1228
|
+
labelNames: ["insertOutcome"],
|
|
1229
|
+
}),
|
|
1230
|
+
},
|
|
1185
1231
|
opPool: {
|
|
1186
1232
|
aggregatedAttestationPool: {
|
|
1187
1233
|
size: register.gauge({
|
|
@@ -16,6 +16,7 @@ import {
|
|
|
16
16
|
capella,
|
|
17
17
|
deneb,
|
|
18
18
|
gloas,
|
|
19
|
+
heze,
|
|
19
20
|
phase0,
|
|
20
21
|
} from "@lodestar/types";
|
|
21
22
|
import {Logger} from "@lodestar/utils";
|
|
@@ -42,6 +43,7 @@ export enum GossipType {
|
|
|
42
43
|
payload_attestation_message = "payload_attestation_message",
|
|
43
44
|
execution_payload_bid = "execution_payload_bid",
|
|
44
45
|
proposer_preferences = "proposer_preferences",
|
|
46
|
+
inclusion_list = "inclusion_list",
|
|
45
47
|
}
|
|
46
48
|
|
|
47
49
|
export type SequentialGossipType = Exclude<GossipType, GossipType.beacon_attestation>;
|
|
@@ -80,6 +82,7 @@ export type GossipTopicTypeMap = {
|
|
|
80
82
|
[GossipType.payload_attestation_message]: {type: GossipType.payload_attestation_message};
|
|
81
83
|
[GossipType.execution_payload_bid]: {type: GossipType.execution_payload_bid};
|
|
82
84
|
[GossipType.proposer_preferences]: {type: GossipType.proposer_preferences};
|
|
85
|
+
[GossipType.inclusion_list]: {type: GossipType.inclusion_list};
|
|
83
86
|
};
|
|
84
87
|
|
|
85
88
|
export type GossipTopicMap = {
|
|
@@ -113,6 +116,7 @@ export type GossipTypeMap = {
|
|
|
113
116
|
[GossipType.payload_attestation_message]: gloas.PayloadAttestationMessage;
|
|
114
117
|
[GossipType.execution_payload_bid]: gloas.SignedExecutionPayloadBid;
|
|
115
118
|
[GossipType.proposer_preferences]: gloas.SignedProposerPreferences;
|
|
119
|
+
[GossipType.inclusion_list]: heze.SignedInclusionList;
|
|
116
120
|
};
|
|
117
121
|
|
|
118
122
|
export type GossipFnByType = {
|
|
@@ -147,6 +151,7 @@ export type GossipFnByType = {
|
|
|
147
151
|
[GossipType.proposer_preferences]: (
|
|
148
152
|
signedProposerPreferences: gloas.SignedProposerPreferences
|
|
149
153
|
) => Promise<void> | void;
|
|
154
|
+
[GossipType.inclusion_list]: (signedInclusionList: heze.SignedInclusionList) => Promise<void> | void;
|
|
150
155
|
};
|
|
151
156
|
|
|
152
157
|
export type GossipFn = GossipFnByType[keyof GossipFnByType];
|
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
ATTESTATION_SUBNET_COUNT,
|
|
5
5
|
ForkName,
|
|
6
6
|
ForkSeq,
|
|
7
|
+
MAX_SIGNED_INCLUSION_LIST_SIZE,
|
|
7
8
|
SYNC_COMMITTEE_SUBNET_COUNT,
|
|
8
9
|
isForkPostAltair,
|
|
9
10
|
isForkPostElectra,
|
|
@@ -91,6 +92,7 @@ function stringifyGossipTopicType(topic: GossipTopic): string {
|
|
|
91
92
|
case GossipType.payload_attestation_message:
|
|
92
93
|
case GossipType.execution_payload_bid:
|
|
93
94
|
case GossipType.proposer_preferences:
|
|
95
|
+
case GossipType.inclusion_list:
|
|
94
96
|
return topic.type;
|
|
95
97
|
case GossipType.beacon_attestation:
|
|
96
98
|
case GossipType.sync_committee:
|
|
@@ -144,6 +146,8 @@ export function getGossipSSZType(topic: GossipTopic) {
|
|
|
144
146
|
return isForkPostGloas(fork) ? sszTypesFor(fork).SignedExecutionPayloadBid : ssz.gloas.SignedExecutionPayloadBid;
|
|
145
147
|
case GossipType.proposer_preferences:
|
|
146
148
|
return ssz.gloas.SignedProposerPreferences;
|
|
149
|
+
case GossipType.inclusion_list:
|
|
150
|
+
return ssz.heze.SignedInclusionList;
|
|
147
151
|
}
|
|
148
152
|
}
|
|
149
153
|
|
|
@@ -152,6 +156,9 @@ export function getGossipSSZType(topic: GossipTopic) {
|
|
|
152
156
|
*/
|
|
153
157
|
export function getGossipSSZMaxSize(topic: GossipTopic, config: ChainForkConfig, sszType: CompositeTypeAny): number {
|
|
154
158
|
const maxSize = Math.min(sszType.maxSize, config.MAX_PAYLOAD_SIZE);
|
|
159
|
+
if (topic.type === GossipType.inclusion_list) {
|
|
160
|
+
return Math.min(maxSize, MAX_SIGNED_INCLUSION_LIST_SIZE);
|
|
161
|
+
}
|
|
155
162
|
if (isForkPostGloas(topic.boundary.fork) && topic.type === GossipType.data_column_sidecar) {
|
|
156
163
|
return Math.min(maxSize, computeMaxGloasDataColumnSidecarSize(config));
|
|
157
164
|
}
|
|
@@ -235,6 +242,7 @@ export function parseGossipTopic(forkDigestContext: ForkDigestContext, topicStr:
|
|
|
235
242
|
case GossipType.payload_attestation_message:
|
|
236
243
|
case GossipType.execution_payload_bid:
|
|
237
244
|
case GossipType.proposer_preferences:
|
|
245
|
+
case GossipType.inclusion_list:
|
|
238
246
|
return {type: gossipTypeStr, boundary, encoding};
|
|
239
247
|
}
|
|
240
248
|
|
|
@@ -292,6 +300,10 @@ export function getCoreTopicsAtFork(
|
|
|
292
300
|
topics.push({type: GossipType.proposer_preferences});
|
|
293
301
|
}
|
|
294
302
|
|
|
303
|
+
if (ForkSeq[fork] >= ForkSeq.heze) {
|
|
304
|
+
topics.push({type: GossipType.inclusion_list});
|
|
305
|
+
}
|
|
306
|
+
|
|
295
307
|
// After fulu also track data_column_sidecar_{index}
|
|
296
308
|
if (ForkSeq[fork] >= ForkSeq.fulu) {
|
|
297
309
|
topics.push(...getDataColumnSidecarTopics(networkConfig, opts.subscribeAllColumnSubnets));
|
|
@@ -409,6 +421,7 @@ export const gossipTopicIgnoreDuplicatePublishError: Record<GossipType, boolean>
|
|
|
409
421
|
[GossipType.payload_attestation_message]: true,
|
|
410
422
|
[GossipType.execution_payload_bid]: true,
|
|
411
423
|
[GossipType.proposer_preferences]: true,
|
|
424
|
+
[GossipType.inclusion_list]: true,
|
|
412
425
|
};
|
|
413
426
|
|
|
414
427
|
/**
|
|
@@ -447,4 +460,5 @@ export const gossipTopicAllowPublishToZeroPeers: Record<GossipType, boolean> = {
|
|
|
447
460
|
[GossipType.payload_attestation_message]: false,
|
|
448
461
|
[GossipType.execution_payload_bid]: false,
|
|
449
462
|
[GossipType.proposer_preferences]: false,
|
|
463
|
+
[GossipType.inclusion_list]: false,
|
|
450
464
|
};
|
package/src/network/interface.ts
CHANGED
|
@@ -33,6 +33,7 @@ import {
|
|
|
33
33
|
deneb,
|
|
34
34
|
fulu,
|
|
35
35
|
gloas,
|
|
36
|
+
heze,
|
|
36
37
|
phase0,
|
|
37
38
|
} from "@lodestar/types";
|
|
38
39
|
import {BlockInputSource} from "../chain/blocks/blockInput/types.js";
|
|
@@ -118,6 +119,7 @@ export interface INetwork extends INetworkCorePublic {
|
|
|
118
119
|
publishSignedExecutionPayloadBid(signedBid: gloas.SignedExecutionPayloadBid): Promise<number>;
|
|
119
120
|
publishPayloadAttestationMessage(payloadAttestationMessage: gloas.PayloadAttestationMessage): Promise<number>;
|
|
120
121
|
publishProposerPreferences(signedProposerPreferences: gloas.SignedProposerPreferences): Promise<number>;
|
|
122
|
+
publishInclusionList(signedInclusionList: heze.SignedInclusionList): Promise<number>;
|
|
121
123
|
|
|
122
124
|
// Debug
|
|
123
125
|
dumpGossipQueue(gossipType: GossipType): Promise<PendingGossipsubMessage[]>;
|
package/src/network/network.ts
CHANGED
|
@@ -26,6 +26,7 @@ import {
|
|
|
26
26
|
deneb,
|
|
27
27
|
fulu,
|
|
28
28
|
gloas,
|
|
29
|
+
heze,
|
|
29
30
|
isGloasDataColumnSidecar,
|
|
30
31
|
phase0,
|
|
31
32
|
} from "@lodestar/types";
|
|
@@ -531,6 +532,16 @@ export class Network implements INetwork {
|
|
|
531
532
|
);
|
|
532
533
|
}
|
|
533
534
|
|
|
535
|
+
async publishInclusionList(signedInclusionList: heze.SignedInclusionList): Promise<number> {
|
|
536
|
+
const epoch = computeEpochAtSlot(signedInclusionList.message.slot);
|
|
537
|
+
const boundary = this.config.getForkBoundaryAtEpoch(epoch);
|
|
538
|
+
|
|
539
|
+
return this.publishGossip<GossipType.inclusion_list>(
|
|
540
|
+
{type: GossipType.inclusion_list, boundary},
|
|
541
|
+
signedInclusionList
|
|
542
|
+
);
|
|
543
|
+
}
|
|
544
|
+
|
|
534
545
|
async publishProposerPreferences(signedProposerPreferences: gloas.SignedProposerPreferences): Promise<number> {
|
|
535
546
|
const epoch = computeEpochAtSlot(signedProposerPreferences.message.proposalSlot);
|
|
536
547
|
const boundary = this.config.getForkBoundaryAtEpoch(epoch);
|