@lodestar/beacon-node 1.51.0-dev.99edacec52 → 1.51.0-dev.9cb14e3381
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 +100 -8
- 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/archiveStore/utils/archiveBlocks.d.ts.map +1 -1
- package/lib/chain/archiveStore/utils/archiveBlocks.js +54 -96
- package/lib/chain/archiveStore/utils/archiveBlocks.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/db/beacon.d.ts.map +1 -1
- package/lib/db/beacon.js +2 -0
- package/lib/db/beacon.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/index.d.ts +1 -0
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +2 -0
- package/lib/index.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.map +1 -1
- package/lib/network/processor/index.js +27 -25
- 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 +130 -8
- package/src/api/options.ts +3 -0
- package/src/chain/archiveStore/utils/archiveBlocks.ts +64 -126
- 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/db/beacon.ts +5 -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/index.ts +2 -0
- 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 +23 -23
- 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
|
@@ -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
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import crypto from "node:crypto";
|
|
2
|
+
import {SerializedList} from "@chainsafe/ssz";
|
|
2
3
|
import {ChainConfig} from "@lodestar/config";
|
|
3
4
|
import {
|
|
4
5
|
BLOB_TX_TYPE,
|
|
@@ -137,10 +138,12 @@ export class ExecutionEngineMockBackend implements JsonRpcBackend {
|
|
|
137
138
|
engine_newPayloadV3: this.notifyNewPayload.bind(this),
|
|
138
139
|
engine_newPayloadV4: this.notifyNewPayload.bind(this),
|
|
139
140
|
engine_newPayloadV5: this.notifyNewPayload.bind(this),
|
|
141
|
+
engine_newPayloadV6: this.notifyNewPayload.bind(this),
|
|
140
142
|
engine_forkchoiceUpdatedV1: this.notifyForkchoiceUpdate.bind(this),
|
|
141
143
|
engine_forkchoiceUpdatedV2: this.notifyForkchoiceUpdate.bind(this),
|
|
142
144
|
engine_forkchoiceUpdatedV3: this.notifyForkchoiceUpdate.bind(this),
|
|
143
145
|
engine_forkchoiceUpdatedV4: this.notifyForkchoiceUpdate.bind(this),
|
|
146
|
+
engine_forkchoiceUpdatedV5: this.notifyForkchoiceUpdate.bind(this),
|
|
144
147
|
engine_getPayloadV1: this.getPayloadV1.bind(this),
|
|
145
148
|
engine_getPayloadV2: this.getPayloadV5.bind(this),
|
|
146
149
|
engine_getPayloadV3: this.getPayloadV5.bind(this),
|
|
@@ -151,6 +154,7 @@ export class ExecutionEngineMockBackend implements JsonRpcBackend {
|
|
|
151
154
|
engine_getClientVersionV1: this.getClientVersionV1.bind(this),
|
|
152
155
|
engine_getBlobsV1: this.getBlobs.bind(this),
|
|
153
156
|
engine_getBlobsV2: this.getBlobsV2.bind(this),
|
|
157
|
+
engine_getInclusionListV1: this.getInclusionList.bind(this),
|
|
154
158
|
};
|
|
155
159
|
}
|
|
156
160
|
|
|
@@ -234,7 +238,13 @@ export class ExecutionEngineMockBackend implements JsonRpcBackend {
|
|
|
234
238
|
// IF the payload has been fully validated while processing the call
|
|
235
239
|
// RETURN payload status from the Payload validation process
|
|
236
240
|
// If validation succeeds, the response MUST contain {status: VALID, latestValidHash: payload.blockHash}
|
|
237
|
-
|
|
241
|
+
// The mock does not check inclusion list constraints, so every payload satisfies them (PayloadStatusV2)
|
|
242
|
+
return {
|
|
243
|
+
status: ExecutionPayloadStatus.VALID,
|
|
244
|
+
latestValidHash: blockHash,
|
|
245
|
+
validationError: null,
|
|
246
|
+
inclusionListSatisfied: true,
|
|
247
|
+
};
|
|
238
248
|
}
|
|
239
249
|
|
|
240
250
|
/**
|
|
@@ -343,14 +353,14 @@ export class ExecutionEngineMockBackend implements JsonRpcBackend {
|
|
|
343
353
|
executionPayload.gasUsed = Math.floor(0.5 * INTEROP_GAS_LIMIT);
|
|
344
354
|
executionPayload.timestamp = payloadAttributes.timestamp;
|
|
345
355
|
executionPayload.blockHash = crypto.randomBytes(32);
|
|
346
|
-
|
|
356
|
+
const transactions: Uint8Array[] = [];
|
|
347
357
|
|
|
348
358
|
// Between 0 and 4 transactions for all forks
|
|
349
359
|
const eip1559TxCount = Math.round(4 * Math.random());
|
|
350
360
|
for (let i = 0; i < eip1559TxCount; i++) {
|
|
351
361
|
const tx = crypto.randomBytes(512);
|
|
352
362
|
tx[0] = TX_TYPE_EIP1559;
|
|
353
|
-
|
|
363
|
+
transactions.push(tx);
|
|
354
364
|
}
|
|
355
365
|
|
|
356
366
|
const commitments: deneb.KZGCommitment[] = [];
|
|
@@ -364,7 +374,7 @@ export class ExecutionEngineMockBackend implements JsonRpcBackend {
|
|
|
364
374
|
const blob = generateRandomBlob();
|
|
365
375
|
const commitment = kzg.blobToKzgCommitment(blob);
|
|
366
376
|
const {proofs: cellProofs} = kzg.computeCellsAndKzgProofs(blob);
|
|
367
|
-
|
|
377
|
+
transactions.push(transactionForKzgCommitment(commitment));
|
|
368
378
|
commitments.push(commitment);
|
|
369
379
|
blobs.push(blob);
|
|
370
380
|
proofs.push(...cellProofs);
|
|
@@ -376,12 +386,13 @@ export class ExecutionEngineMockBackend implements JsonRpcBackend {
|
|
|
376
386
|
const blob = generateRandomBlob();
|
|
377
387
|
const commitment = kzg.blobToKzgCommitment(blob);
|
|
378
388
|
const proof = kzg.computeBlobKzgProof(blob, commitment);
|
|
379
|
-
|
|
389
|
+
transactions.push(transactionForKzgCommitment(commitment));
|
|
380
390
|
commitments.push(commitment);
|
|
381
391
|
blobs.push(blob);
|
|
382
392
|
proofs.push(proof);
|
|
383
393
|
}
|
|
384
394
|
}
|
|
395
|
+
executionPayload.transactions = SerializedList.fromArray(transactions);
|
|
385
396
|
|
|
386
397
|
if (ForkSeq[fork] >= ForkSeq.capella) {
|
|
387
398
|
(executionPayload as ExecutionPayload<ForkPostCapella>).withdrawals = ssz.capella.Withdrawals.defaultValue();
|
|
@@ -409,7 +420,12 @@ export class ExecutionEngineMockBackend implements JsonRpcBackend {
|
|
|
409
420
|
// IF the payload is deemed VALID and the build process has begun
|
|
410
421
|
// {payloadStatus: {status: VALID, latestValidHash: forkchoiceState.headBlockHash, validationError: null}, payloadId: buildProcessId}
|
|
411
422
|
return {
|
|
412
|
-
payloadStatus: {
|
|
423
|
+
payloadStatus: {
|
|
424
|
+
status: ExecutionPayloadStatus.VALID,
|
|
425
|
+
latestValidHash: null,
|
|
426
|
+
validationError: null,
|
|
427
|
+
inclusionListSatisfied: true,
|
|
428
|
+
},
|
|
413
429
|
payloadId: String(payloadId as number),
|
|
414
430
|
};
|
|
415
431
|
}
|
|
@@ -418,7 +434,12 @@ export class ExecutionEngineMockBackend implements JsonRpcBackend {
|
|
|
418
434
|
// IF the payload is deemed VALID and a build process hasn't been started
|
|
419
435
|
// {payloadStatus: {status: VALID, latestValidHash: forkchoiceState.headBlockHash, validationError: null}, payloadId: null}
|
|
420
436
|
return {
|
|
421
|
-
payloadStatus: {
|
|
437
|
+
payloadStatus: {
|
|
438
|
+
status: ExecutionPayloadStatus.VALID,
|
|
439
|
+
latestValidHash: null,
|
|
440
|
+
validationError: null,
|
|
441
|
+
inclusionListSatisfied: true,
|
|
442
|
+
},
|
|
422
443
|
payloadId: null,
|
|
423
444
|
};
|
|
424
445
|
}
|
|
@@ -487,6 +508,10 @@ export class ExecutionEngineMockBackend implements JsonRpcBackend {
|
|
|
487
508
|
return null;
|
|
488
509
|
}
|
|
489
510
|
|
|
511
|
+
private getInclusionList(): EngineApiRpcReturnTypes["engine_getInclusionListV1"] {
|
|
512
|
+
return [];
|
|
513
|
+
}
|
|
514
|
+
|
|
490
515
|
private timestampToFork(timestamp: number): ForkPostBellatrix {
|
|
491
516
|
if (timestamp >= this.gloasForkTimestamp) return ForkName.gloas;
|
|
492
517
|
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,13 +19,18 @@ export type WithdrawalV1 = {
|
|
|
17
19
|
amount: QUANTITY;
|
|
18
20
|
};
|
|
19
21
|
|
|
20
|
-
type FcuAttributes = {headBlockHash: DATA
|
|
22
|
+
type FcuAttributes = {headBlockHash: DATA} & Omit<PayloadAttributesRpc, "withdrawals" | "inclusionListTransactions"> & {
|
|
23
|
+
inclusionListTransactions?: bellatrix.Transactions;
|
|
24
|
+
};
|
|
21
25
|
|
|
22
26
|
export class PayloadIdCache {
|
|
23
|
-
private readonly payloadIdByFcuAttributes = new Map<
|
|
27
|
+
private readonly payloadIdByFcuAttributes = new Map<
|
|
28
|
+
string,
|
|
29
|
+
{payloadId: PayloadId; fullKey: string; inclusionListTransactions?: bellatrix.Transactions}
|
|
30
|
+
>();
|
|
24
31
|
|
|
25
|
-
getFullKey({headBlockHash,
|
|
26
|
-
return `${headBlockHash}-${
|
|
32
|
+
getFullKey({headBlockHash, timestamp, prevRandao, suggestedFeeRecipient}: FcuAttributes): string {
|
|
33
|
+
return `${headBlockHash}-${timestamp}-${prevRandao}-${suggestedFeeRecipient}`;
|
|
27
34
|
}
|
|
28
35
|
getKey({timestamp}: Pick<FcuAttributes, "timestamp">): string {
|
|
29
36
|
return timestamp;
|
|
@@ -37,7 +44,8 @@ export class PayloadIdCache {
|
|
|
37
44
|
add(fcuAttributes: FcuAttributes, payloadId: PayloadId): void {
|
|
38
45
|
const key = this.getKey(fcuAttributes);
|
|
39
46
|
const fullKey = this.getFullKey(fcuAttributes);
|
|
40
|
-
|
|
47
|
+
const {inclusionListTransactions} = fcuAttributes;
|
|
48
|
+
this.payloadIdByFcuAttributes.set(key, {payloadId, fullKey, inclusionListTransactions});
|
|
41
49
|
}
|
|
42
50
|
|
|
43
51
|
prune(): void {
|
|
@@ -49,6 +57,16 @@ export class PayloadIdCache {
|
|
|
49
57
|
const key = this.getKey(fcuAttributes);
|
|
50
58
|
const fullKey = this.getFullKey(fcuAttributes);
|
|
51
59
|
const payloadInfo = this.payloadIdByFcuAttributes.get(key);
|
|
52
|
-
return payloadInfo?.fullKey === fullKey
|
|
60
|
+
return payloadInfo?.fullKey === fullKey &&
|
|
61
|
+
isSameInclusionList(payloadInfo.inclusionListTransactions, fcuAttributes.inclusionListTransactions)
|
|
62
|
+
? payloadInfo.payloadId
|
|
63
|
+
: undefined;
|
|
53
64
|
}
|
|
54
65
|
}
|
|
66
|
+
|
|
67
|
+
function isSameInclusionList(a?: bellatrix.Transactions, b?: bellatrix.Transactions): boolean {
|
|
68
|
+
if (a === undefined || b === undefined) {
|
|
69
|
+
return a === b;
|
|
70
|
+
}
|
|
71
|
+
return byteArrayEquals(a.bytes, b.bytes);
|
|
72
|
+
}
|
|
@@ -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
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {Type} from "@chainsafe/ssz";
|
|
1
|
+
import {SerializedList, Type} from "@chainsafe/ssz";
|
|
2
2
|
import {
|
|
3
3
|
BUILDER_DEPOSIT_REQUEST_TYPE,
|
|
4
4
|
BUILDER_EXIT_REQUEST_TYPE,
|
|
@@ -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 = {
|
|
@@ -165,7 +181,7 @@ export type ExecutionPayloadBodyRpc = {
|
|
|
165
181
|
};
|
|
166
182
|
|
|
167
183
|
export type ExecutionPayloadBody = {
|
|
168
|
-
transactions: bellatrix.
|
|
184
|
+
transactions: bellatrix.Transactions;
|
|
169
185
|
withdrawals: capella.Withdrawals | null;
|
|
170
186
|
};
|
|
171
187
|
|
|
@@ -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;
|
|
@@ -295,7 +316,7 @@ export function serializeExecutionPayload(fork: ForkName, data: ExecutionPayload
|
|
|
295
316
|
extraData: bytesToData(data.extraData),
|
|
296
317
|
baseFeePerGas: numToQuantity(data.baseFeePerGas),
|
|
297
318
|
blockHash: bytesToData(data.blockHash),
|
|
298
|
-
transactions: data.transactions
|
|
319
|
+
transactions: Array.from(data.transactions, (tran) => bytesToData(tran)),
|
|
299
320
|
};
|
|
300
321
|
|
|
301
322
|
// Capella adds withdrawals to the ExecutionPayload
|
|
@@ -379,7 +400,7 @@ export function parseExecutionPayload(
|
|
|
379
400
|
extraData: dataToBytes(data.extraData, null),
|
|
380
401
|
baseFeePerGas: quantityToBigint(data.baseFeePerGas),
|
|
381
402
|
blockHash: dataToBytes(data.blockHash, 32),
|
|
382
|
-
transactions: data.transactions.map((tran) => dataToBytes(tran, null)),
|
|
403
|
+
transactions: SerializedList.fromArray(data.transactions.map((tran) => dataToBytes(tran, null))),
|
|
383
404
|
};
|
|
384
405
|
|
|
385
406
|
if (ForkSeq[fork] >= ForkSeq.capella) {
|
|
@@ -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 Array.from(data, (transaction) => bytesToData(transaction));
|
|
478
|
+
}
|
|
479
|
+
|
|
480
|
+
export function deserializeInclusionList(data: InclusionListRpc): bellatrix.Transactions {
|
|
481
|
+
return SerializedList.fromArray(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
|
|
|
@@ -635,7 +670,7 @@ export function deserializeExecutionRequests(fork: ForkName, serialized: Executi
|
|
|
635
670
|
export function deserializeExecutionPayloadBody(data: ExecutionPayloadBodyRpc | null): ExecutionPayloadBody | null {
|
|
636
671
|
return data
|
|
637
672
|
? {
|
|
638
|
-
transactions: data.transactions.map((tran) => dataToBytes(tran, null)),
|
|
673
|
+
transactions: SerializedList.fromArray(data.transactions.map((tran) => dataToBytes(tran, null))),
|
|
639
674
|
withdrawals: data.withdrawals ? data.withdrawals.map(deserializeWithdrawal) : null,
|
|
640
675
|
}
|
|
641
676
|
: null;
|
|
@@ -658,7 +693,7 @@ export function serializeExecutionPayloadBodyV2(data: ExecutionPayloadBodyV2 | n
|
|
|
658
693
|
export function serializeExecutionPayloadBody(data: ExecutionPayloadBody | null): ExecutionPayloadBodyRpc | null {
|
|
659
694
|
return data
|
|
660
695
|
? {
|
|
661
|
-
transactions: data.transactions
|
|
696
|
+
transactions: Array.from(data.transactions, (tran) => bytesToData(tran)),
|
|
662
697
|
withdrawals: data.withdrawals ? data.withdrawals.map(serializeWithdrawal) : null,
|
|
663
698
|
}
|
|
664
699
|
: null;
|
package/src/index.ts
CHANGED
|
@@ -6,6 +6,8 @@ export {persistAnchorState} from "./chain/index.js";
|
|
|
6
6
|
export {DbCPStateDatastore} from "./chain/stateCache/datastore/db.js";
|
|
7
7
|
export {FileCPStateDatastore} from "./chain/stateCache/datastore/file.js";
|
|
8
8
|
export {BeaconDb, type IBeaconDb} from "./db/index.js";
|
|
9
|
+
// Export execution engine to make it usable by builder
|
|
10
|
+
export {initializeExecutionEngine} from "./execution/index.js";
|
|
9
11
|
// Export metrics utilities to de-duplicate validator metrics
|
|
10
12
|
export {
|
|
11
13
|
type HttpMetricsServer,
|
|
@@ -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";
|
|
@@ -1202,11 +1203,31 @@ export function createLodestarMetrics(
|
|
|
1202
1203
|
help: "The total result of calling notifyForkchoiceUpdate execution engine api",
|
|
1203
1204
|
labelNames: ["result"],
|
|
1204
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
|
+
}),
|
|
1205
1215
|
engineApiRequests: register.counter<{transport: string}>({
|
|
1206
1216
|
name: "lodestar_execution_engine_api_requests_total",
|
|
1207
1217
|
help: "Total engine API requests by transport",
|
|
1208
1218
|
labelNames: ["transport"],
|
|
1209
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
|
+
},
|
|
1210
1231
|
opPool: {
|
|
1211
1232
|
aggregatedAttestationPool: {
|
|
1212
1233
|
size: register.gauge({
|
|
@@ -1453,6 +1474,11 @@ export function createLodestarMetrics(
|
|
|
1453
1474
|
help: "Total number of InsertOutcome as a result of adding an execution payload bid from gossip to the pool",
|
|
1454
1475
|
labelNames: ["insertOutcome"],
|
|
1455
1476
|
}),
|
|
1477
|
+
apiInsertOutcome: register.counter<{insertOutcome: InsertOutcome}>({
|
|
1478
|
+
name: "lodestar_oppool_execution_payload_bid_pool_api_insert_outcome_total",
|
|
1479
|
+
help: "Total number of InsertOutcome as a result of adding an execution payload bid from api to the pool",
|
|
1480
|
+
labelNames: ["insertOutcome"],
|
|
1481
|
+
}),
|
|
1456
1482
|
apiValidationTime: register.histogram({
|
|
1457
1483
|
name: "lodestar_api_execution_payload_bid_validation_time_seconds",
|
|
1458
1484
|
help: "Time elapsed for signed execution payload bid validation - api path",
|
|
@@ -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];
|