@lodestar/beacon-node 1.51.0-dev.7d2ef8139c → 1.51.0-dev.808c9f25d9
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 +6 -6
- package/lib/api/impl/beacon/blocks/index.js.map +1 -1
- package/lib/api/impl/beacon/index.d.ts +2 -1
- package/lib/api/impl/beacon/index.d.ts.map +1 -1
- package/lib/api/impl/beacon/index.js +2 -2
- package/lib/api/impl/beacon/index.js.map +1 -1
- package/lib/api/impl/beacon/state/index.d.ts.map +1 -1
- package/lib/api/impl/beacon/state/index.js +8 -2
- package/lib/api/impl/beacon/state/index.js.map +1 -1
- package/lib/api/impl/beacon/state/utils.d.ts +2 -1
- package/lib/api/impl/beacon/state/utils.d.ts.map +1 -1
- package/lib/api/impl/beacon/state/utils.js +17 -9
- package/lib/api/impl/beacon/state/utils.js.map +1 -1
- package/lib/api/impl/debug/index.d.ts.map +1 -1
- package/lib/api/impl/debug/index.js +3 -0
- package/lib/api/impl/debug/index.js.map +1 -1
- package/lib/api/impl/validator/index.d.ts.map +1 -1
- package/lib/api/impl/validator/index.js +102 -10
- package/lib/api/impl/validator/index.js.map +1 -1
- package/lib/api/options.d.ts +2 -0
- package/lib/api/options.d.ts.map +1 -1
- package/lib/api/options.js +1 -0
- package/lib/api/options.js.map +1 -1
- package/lib/chain/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 +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 +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 -10
- 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 +150 -0
- package/lib/chain/validation/inclusionList.js.map +1 -0
- package/lib/chain/validation/index.d.ts +1 -0
- package/lib/chain/validation/index.d.ts.map +1 -1
- package/lib/chain/validation/index.js +1 -0
- package/lib/chain/validation/index.js.map +1 -1
- package/lib/execution/builder/validateBid.d.ts.map +1 -1
- package/lib/execution/builder/validateBid.js +14 -1
- package/lib/execution/builder/validateBid.js.map +1 -1
- package/lib/execution/engine/blobVersionedHashes.d.ts +1 -1
- package/lib/execution/engine/blobVersionedHashes.d.ts.map +1 -1
- package/lib/execution/engine/blobVersionedHashes.js.map +1 -1
- package/lib/execution/engine/disabled.d.ts +1 -0
- package/lib/execution/engine/disabled.d.ts.map +1 -1
- package/lib/execution/engine/disabled.js +3 -0
- package/lib/execution/engine/disabled.js.map +1 -1
- package/lib/execution/engine/http.d.ts +8 -2
- package/lib/execution/engine/http.d.ts.map +1 -1
- package/lib/execution/engine/http.js +27 -4
- package/lib/execution/engine/http.js.map +1 -1
- package/lib/execution/engine/interface.d.ts +11 -2
- package/lib/execution/engine/interface.d.ts.map +1 -1
- package/lib/execution/engine/interface.js.map +1 -1
- package/lib/execution/engine/jsonRpcTransport.d.ts +3 -2
- package/lib/execution/engine/jsonRpcTransport.d.ts.map +1 -1
- package/lib/execution/engine/jsonRpcTransport.js +33 -9
- package/lib/execution/engine/jsonRpcTransport.js.map +1 -1
- package/lib/execution/engine/mock.d.ts +1 -0
- package/lib/execution/engine/mock.d.ts.map +1 -1
- package/lib/execution/engine/mock.js +31 -7
- package/lib/execution/engine/mock.js.map +1 -1
- package/lib/execution/engine/payloadIdCache.d.ts +5 -3
- package/lib/execution/engine/payloadIdCache.d.ts.map +1 -1
- package/lib/execution/engine/payloadIdCache.js +15 -4
- package/lib/execution/engine/payloadIdCache.js.map +1 -1
- package/lib/execution/engine/restTransport.d.ts +2 -1
- package/lib/execution/engine/restTransport.d.ts.map +1 -1
- package/lib/execution/engine/restTransport.js +3 -0
- package/lib/execution/engine/restTransport.js.map +1 -1
- package/lib/execution/engine/sszTypes.d.ts +38 -38
- package/lib/execution/engine/transport.d.ts +5 -2
- package/lib/execution/engine/transport.d.ts.map +1 -1
- package/lib/execution/engine/types.d.ts +25 -1
- package/lib/execution/engine/types.d.ts.map +1 -1
- package/lib/execution/engine/types.js +17 -4
- package/lib/execution/engine/types.js.map +1 -1
- package/lib/metrics/metrics/beacon.d.ts +16 -0
- package/lib/metrics/metrics/beacon.d.ts.map +1 -1
- package/lib/metrics/metrics/beacon.js +35 -0
- package/lib/metrics/metrics/beacon.js.map +1 -1
- package/lib/metrics/metrics/lodestar.d.ts +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 +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/peers/utils/enrSubnetsDeserialize.d.ts.map +1 -1
- package/lib/network/peers/utils/enrSubnetsDeserialize.js +5 -2
- package/lib/network/peers/utils/enrSubnetsDeserialize.js.map +1 -1
- package/lib/network/processor/gossipHandlers.d.ts.map +1 -1
- package/lib/network/processor/gossipHandlers.js +63 -17
- package/lib/network/processor/gossipHandlers.js.map +1 -1
- package/lib/network/processor/gossipQueues/index.d.ts.map +1 -1
- package/lib/network/processor/gossipQueues/index.js +6 -0
- package/lib/network/processor/gossipQueues/index.js.map +1 -1
- package/lib/network/processor/gossipValidatorFn.d.ts.map +1 -1
- package/lib/network/processor/gossipValidatorFn.js +5 -1
- package/lib/network/processor/gossipValidatorFn.js.map +1 -1
- package/lib/network/processor/index.d.ts +5 -0
- package/lib/network/processor/index.d.ts.map +1 -1
- package/lib/network/processor/index.js +37 -26
- package/lib/network/processor/index.js.map +1 -1
- package/lib/network/reqresp/ReqRespBeaconNode.d.ts.map +1 -1
- package/lib/network/reqresp/ReqRespBeaconNode.js +6 -0
- package/lib/network/reqresp/ReqRespBeaconNode.js.map +1 -1
- package/lib/network/reqresp/handlers/inclusionListsByIndices.d.ts +10 -0
- package/lib/network/reqresp/handlers/inclusionListsByIndices.d.ts.map +1 -0
- package/lib/network/reqresp/handlers/inclusionListsByIndices.js +30 -0
- package/lib/network/reqresp/handlers/inclusionListsByIndices.js.map +1 -0
- package/lib/network/reqresp/handlers/index.d.ts.map +1 -1
- package/lib/network/reqresp/handlers/index.js +5 -0
- package/lib/network/reqresp/handlers/index.js.map +1 -1
- package/lib/network/reqresp/protocols.d.ts +1 -0
- package/lib/network/reqresp/protocols.d.ts.map +1 -1
- package/lib/network/reqresp/protocols.js +5 -0
- package/lib/network/reqresp/protocols.js.map +1 -1
- package/lib/network/reqresp/rateLimit.d.ts.map +1 -1
- package/lib/network/reqresp/rateLimit.js +4 -0
- package/lib/network/reqresp/rateLimit.js.map +1 -1
- package/lib/network/reqresp/types.d.ts +5 -2
- package/lib/network/reqresp/types.d.ts.map +1 -1
- package/lib/network/reqresp/types.js +3 -0
- package/lib/network/reqresp/types.js.map +1 -1
- package/lib/sync/unknownBlock.d.ts.map +1 -1
- package/lib/sync/unknownBlock.js +42 -18
- package/lib/sync/unknownBlock.js.map +1 -1
- package/package.json +30 -30
- package/src/api/impl/api.ts +1 -1
- package/src/api/impl/beacon/blocks/index.ts +10 -15
- package/src/api/impl/beacon/index.ts +3 -1
- package/src/api/impl/beacon/state/index.ts +10 -1
- package/src/api/impl/beacon/state/utils.ts +19 -9
- package/src/api/impl/debug/index.ts +4 -0
- package/src/api/impl/validator/index.ts +132 -10
- package/src/api/options.ts +3 -0
- package/src/chain/ColumnReconstructionTracker.ts +60 -41
- 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 +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 -19
- package/src/chain/regen/interface.ts +1 -0
- package/src/chain/validation/executionPayloadBid.ts +52 -2
- package/src/chain/validation/inclusionList.ts +192 -0
- package/src/chain/validation/index.ts +1 -0
- package/src/execution/builder/validateBid.ts +23 -2
- package/src/execution/engine/blobVersionedHashes.ts +1 -1
- package/src/execution/engine/disabled.ts +4 -0
- package/src/execution/engine/http.ts +40 -5
- package/src/execution/engine/interface.ts +27 -3
- package/src/execution/engine/jsonRpcTransport.ts +46 -9
- package/src/execution/engine/mock.ts +32 -7
- package/src/execution/engine/payloadIdCache.ts +24 -6
- package/src/execution/engine/restTransport.ts +15 -1
- package/src/execution/engine/transport.ts +7 -2
- package/src/execution/engine/types.ts +41 -6
- package/src/metrics/metrics/beacon.ts +37 -0
- package/src/metrics/metrics/lodestar.ts +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 +80 -20
- package/src/network/processor/gossipQueues/index.ts +6 -0
- package/src/network/processor/gossipValidatorFn.ts +5 -0
- package/src/network/processor/index.ts +33 -24
- package/src/network/processor/types.ts +1 -1
- package/src/network/reqresp/ReqRespBeaconNode.ts +7 -0
- package/src/network/reqresp/handlers/inclusionListsByIndices.ts +44 -0
- package/src/network/reqresp/handlers/index.ts +5 -0
- package/src/network/reqresp/protocols.ts +6 -0
- package/src/network/reqresp/rateLimit.ts +4 -0
- package/src/network/reqresp/types.ts +6 -0
- package/src/sync/unknownBlock.ts +47 -28
|
@@ -0,0 +1,192 @@
|
|
|
1
|
+
import {ProtoBlock} from "@lodestar/fork-choice";
|
|
2
|
+
import {GENESIS_SLOT, MIN_SEED_LOOKAHEAD, isForkPostHeze} from "@lodestar/params";
|
|
3
|
+
import {
|
|
4
|
+
EpochShuffling,
|
|
5
|
+
computeEpochAtSlot,
|
|
6
|
+
computeStartSlotAtEpoch,
|
|
7
|
+
getInclusionListCommittee,
|
|
8
|
+
getInclusionListSignatureSet,
|
|
9
|
+
} from "@lodestar/state-transition";
|
|
10
|
+
import {Epoch, RootHex, heze} from "@lodestar/types";
|
|
11
|
+
import {toRootHex} from "@lodestar/utils";
|
|
12
|
+
import {InclusionListError, InclusionListErrorCode} from "../errors/inclusionList.js";
|
|
13
|
+
import {GossipAction} from "../errors/index.js";
|
|
14
|
+
import {IBeaconChain} from "../interface.js";
|
|
15
|
+
import {RegenCaller} from "../regen/index.js";
|
|
16
|
+
import {isValidDependentRoot} from "./proposerPreferences.js";
|
|
17
|
+
|
|
18
|
+
export type InclusionListValidationResult = {
|
|
19
|
+
/** Positions of `validator_index` in `get_inclusion_list_committee(state, slot)`, several when the committee cycles */
|
|
20
|
+
committeeIndices: number[];
|
|
21
|
+
/** Sum of the byte lengths of `message.transactions` */
|
|
22
|
+
totalBytes: number;
|
|
23
|
+
};
|
|
24
|
+
|
|
25
|
+
/**
|
|
26
|
+
* Gossip validation for the `inclusion_list` topic, in spec rule order. Also applied to inclusion lists
|
|
27
|
+
* submitted over the API before they are published.
|
|
28
|
+
*/
|
|
29
|
+
export async function validateGossipInclusionList(
|
|
30
|
+
chain: IBeaconChain,
|
|
31
|
+
signedInclusionList: heze.SignedInclusionList
|
|
32
|
+
): Promise<InclusionListValidationResult> {
|
|
33
|
+
const {slot, validatorIndex, transactions, dependentRoot} = signedInclusionList.message;
|
|
34
|
+
let totalBytes = 0;
|
|
35
|
+
for (let i = 0; i < transactions.length; i++) {
|
|
36
|
+
totalBytes += transactions.getSize(i);
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
// A pre-heze slot has no inclusion list committee to validate against
|
|
40
|
+
if (!isForkPostHeze(chain.config.getForkName(slot))) {
|
|
41
|
+
throw new InclusionListError(GossipAction.IGNORE, {
|
|
42
|
+
code: InclusionListErrorCode.PRE_HEZE_SLOT,
|
|
43
|
+
inclusionListSlot: slot,
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
// [IGNORE] The message is either the first or second valid message received from validatorIndex
|
|
48
|
+
// for (message.slot, message.dependent_root)
|
|
49
|
+
const dependentRootHex = toRootHex(dependentRoot);
|
|
50
|
+
if (chain.inclusionListStore.seenTwice(slot, dependentRootHex, validatorIndex)) {
|
|
51
|
+
throw new InclusionListError(GossipAction.IGNORE, {
|
|
52
|
+
code: InclusionListErrorCode.MORE_THAN_TWO,
|
|
53
|
+
validatorIndex,
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
// [IGNORE] message.slot is equal to the current slot, with a MAXIMUM_GOSSIP_CLOCK_DISPARITY allowance
|
|
58
|
+
if (!chain.clock.isCurrentSlotGivenGossipDisparity(slot)) {
|
|
59
|
+
throw new InclusionListError(GossipAction.IGNORE, {
|
|
60
|
+
code: InclusionListErrorCode.INVALID_SLOT,
|
|
61
|
+
inclusionListSlot: slot,
|
|
62
|
+
currentSlot: chain.clock.currentSlot,
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
// [IGNORE] The size of message.transactions is greater than 0
|
|
67
|
+
if (totalBytes === 0) {
|
|
68
|
+
throw new InclusionListError(GossipAction.IGNORE, {code: InclusionListErrorCode.EMPTY_TRANSACTIONS});
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
// [REJECT] The size of message.transactions is within upperbound MAX_TRANSACTIONS_BYTES_PER_INCLUSION_LIST
|
|
72
|
+
if (totalBytes > chain.config.MAX_TRANSACTIONS_BYTES_PER_INCLUSION_LIST) {
|
|
73
|
+
throw new InclusionListError(GossipAction.REJECT, {
|
|
74
|
+
code: InclusionListErrorCode.MAXIMUM_SIZE_EXCEEDED,
|
|
75
|
+
totalBytes,
|
|
76
|
+
maxBytes: chain.config.MAX_TRANSACTIONS_BYTES_PER_INCLUSION_LIST,
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
// [REJECT] Every transaction in message.transactions is non-empty
|
|
81
|
+
let emptyTransactionIndex = -1;
|
|
82
|
+
for (let i = 0; i < transactions.length; i++) {
|
|
83
|
+
if (transactions.getSize(i) === 0) {
|
|
84
|
+
emptyTransactionIndex = i;
|
|
85
|
+
break;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
if (emptyTransactionIndex !== -1) {
|
|
89
|
+
throw new InclusionListError(GossipAction.REJECT, {
|
|
90
|
+
code: InclusionListErrorCode.EMPTY_TRANSACTION,
|
|
91
|
+
transactionIndex: emptyTransactionIndex,
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
// [IGNORE] The block with root message.dependent_root has been seen
|
|
96
|
+
const dependentBlock = chain.forkChoice.getBlockHexDefaultStatus(dependentRootHex);
|
|
97
|
+
if (dependentBlock === null) {
|
|
98
|
+
throw new InclusionListError(GossipAction.IGNORE, {
|
|
99
|
+
code: InclusionListErrorCode.UNKNOWN_DEPENDENT_ROOT,
|
|
100
|
+
dependentRoot: dependentRootHex,
|
|
101
|
+
});
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
// [REJECT] The slot of the block with root message.dependent_root is strictly less than
|
|
105
|
+
// compute_start_slot_at_epoch(compute_epoch_at_slot(message.slot) - MIN_SEED_LOOKAHEAD),
|
|
106
|
+
// clamped to genesis like compute_shuffling_dependent_slot
|
|
107
|
+
const epoch = computeEpochAtSlot(slot);
|
|
108
|
+
const dependentEpoch = epoch - MIN_SEED_LOOKAHEAD;
|
|
109
|
+
const maxDependentSlot = Math.max(GENESIS_SLOT, computeStartSlotAtEpoch(dependentEpoch) - 1);
|
|
110
|
+
if (dependentBlock.slot > maxDependentSlot) {
|
|
111
|
+
throw new InclusionListError(GossipAction.REJECT, {
|
|
112
|
+
code: InclusionListErrorCode.INVALID_DEPENDENT_ROOT_SLOT,
|
|
113
|
+
dependentRoot: dependentRootHex,
|
|
114
|
+
dependentSlot: dependentBlock.slot,
|
|
115
|
+
maxSlot: maxDependentSlot,
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
// [IGNORE] is_valid_dependent_root(store, message.dependent_root, epoch - MIN_SEED_LOOKAHEAD)
|
|
120
|
+
if (!isValidDependentRoot(chain.forkChoice, dependentBlock, dependentEpoch)) {
|
|
121
|
+
throw new InclusionListError(GossipAction.IGNORE, {
|
|
122
|
+
code: InclusionListErrorCode.INVALID_DEPENDENT_ROOT,
|
|
123
|
+
dependentRoot: dependentRootHex,
|
|
124
|
+
epoch: dependentEpoch,
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
// [REJECT] validatorIndex is in get_inclusion_list_committee(state, message.slot), where state is the
|
|
129
|
+
// state of the block with root message.dependent_root, i.e. the shuffling of `epoch` keyed by `dependent_root`
|
|
130
|
+
const shuffling = await getShuffling(chain, epoch, dependentRootHex, dependentBlock);
|
|
131
|
+
if (shuffling === null) {
|
|
132
|
+
throw new InclusionListError(GossipAction.IGNORE, {
|
|
133
|
+
code: InclusionListErrorCode.MISSING_SHUFFLING,
|
|
134
|
+
dependentRoot: dependentRootHex,
|
|
135
|
+
epoch,
|
|
136
|
+
});
|
|
137
|
+
}
|
|
138
|
+
const committeeIndices = getInclusionListCommittee(shuffling, slot).getCommitteeIndices(validatorIndex);
|
|
139
|
+
if (committeeIndices.length === 0) {
|
|
140
|
+
throw new InclusionListError(GossipAction.REJECT, {
|
|
141
|
+
code: InclusionListErrorCode.VALIDATOR_NOT_IN_COMMITTEE,
|
|
142
|
+
validatorIndex,
|
|
143
|
+
});
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
// [REJECT] The signature is valid with respect to the validator's public key
|
|
147
|
+
// Domain from the list's own slot, so a list for the first Heze slot verifies while the clock is still in Gloas
|
|
148
|
+
const signatureSet = getInclusionListSignatureSet(chain.config, slot, signedInclusionList);
|
|
149
|
+
// With only 16 inclusion list committee members per slot, batching can delay gossip by 100ms.
|
|
150
|
+
// Verify without batching so inclusion lists can be forwarded sooner.
|
|
151
|
+
if (!(await chain.bls.verifySignatureSets([signatureSet], {batchable: false}))) {
|
|
152
|
+
throw new InclusionListError(GossipAction.REJECT, {code: InclusionListErrorCode.INVALID_SIGNATURE});
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
// Check again after the async validation so concurrent lists of the same validator cannot all pass
|
|
156
|
+
if (chain.inclusionListStore.seenTwice(slot, dependentRootHex, validatorIndex)) {
|
|
157
|
+
throw new InclusionListError(GossipAction.IGNORE, {
|
|
158
|
+
code: InclusionListErrorCode.MORE_THAN_TWO,
|
|
159
|
+
validatorIndex,
|
|
160
|
+
});
|
|
161
|
+
}
|
|
162
|
+
chain.inclusionListStore.markSeen(slot, dependentRootHex, validatorIndex);
|
|
163
|
+
|
|
164
|
+
return {committeeIndices, totalBytes};
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
/**
|
|
168
|
+
* The shuffling of `epoch` on the branch of `dependentBlock`. Usually cached from the head state; when the
|
|
169
|
+
* dependent block is the head across empty epochs that state has not reached the lookahead start slot, so
|
|
170
|
+
* the spec's `process_slots` step is a state regen
|
|
171
|
+
*/
|
|
172
|
+
async function getShuffling(
|
|
173
|
+
chain: IBeaconChain,
|
|
174
|
+
epoch: Epoch,
|
|
175
|
+
dependentRootHex: RootHex,
|
|
176
|
+
dependentBlock: ProtoBlock
|
|
177
|
+
): Promise<EpochShuffling | null> {
|
|
178
|
+
const cached = await chain.shufflingCache.get(epoch, dependentRootHex);
|
|
179
|
+
if (cached !== null) {
|
|
180
|
+
return cached;
|
|
181
|
+
}
|
|
182
|
+
try {
|
|
183
|
+
return await chain.regenStateForAttestationVerification(
|
|
184
|
+
epoch,
|
|
185
|
+
dependentRootHex,
|
|
186
|
+
dependentBlock,
|
|
187
|
+
RegenCaller.validateGossipInclusionList
|
|
188
|
+
);
|
|
189
|
+
} catch {
|
|
190
|
+
return null;
|
|
191
|
+
}
|
|
192
|
+
}
|
|
@@ -3,6 +3,7 @@ export * from "./attestation.js";
|
|
|
3
3
|
export * from "./attesterSlashing.js";
|
|
4
4
|
export * from "./block.js";
|
|
5
5
|
export * from "./blsToExecutionChange.js";
|
|
6
|
+
export * from "./inclusionList.js";
|
|
6
7
|
export * from "./proposerSlashing.js";
|
|
7
8
|
export * from "./syncCommittee.js";
|
|
8
9
|
export * from "./syncCommitteeContributionAndProof.js";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import {routes} from "@lodestar/api";
|
|
2
2
|
import {ProtoBlock} from "@lodestar/fork-choice";
|
|
3
|
-
import {MAX_EXECUTION_PAYMENT, PAYLOAD_BUILDER_VERSION} from "@lodestar/params";
|
|
3
|
+
import {MAX_EXECUTION_PAYMENT, PAYLOAD_BUILDER_VERSION, isForkPostHeze} from "@lodestar/params";
|
|
4
4
|
import {
|
|
5
5
|
computeEpochAtSlot,
|
|
6
6
|
createSingleSignatureSetFromComponents,
|
|
@@ -9,7 +9,7 @@ import {
|
|
|
9
9
|
isGasLimitTargetCompatible,
|
|
10
10
|
isStatePostGloas,
|
|
11
11
|
} from "@lodestar/state-transition";
|
|
12
|
-
import {RootHex, Slot, gloas} from "@lodestar/types";
|
|
12
|
+
import {RootHex, Slot, gloas, heze} from "@lodestar/types";
|
|
13
13
|
import {bigIntMin, byteArrayEquals, prettyGweiToEth, toHex, toRootHex} from "@lodestar/utils";
|
|
14
14
|
import {IBeaconChain} from "../../chain/index.js";
|
|
15
15
|
import {RegenCaller} from "../../chain/regen/index.js";
|
|
@@ -41,6 +41,7 @@ export async function validateBuilderApiExecutionPayloadBid(
|
|
|
41
41
|
}
|
|
42
42
|
): Promise<void> {
|
|
43
43
|
const bid = signedExecutionPayloadBid.message;
|
|
44
|
+
const fork = chain.config.getForkName(bid.slot);
|
|
44
45
|
const {slot, parentBlock, parentBlockHash, parentBlockRoot, entry, getParentExecutionRequests} = request;
|
|
45
46
|
|
|
46
47
|
if (bid.slot !== slot) {
|
|
@@ -76,6 +77,26 @@ export async function validateBuilderApiExecutionPayloadBid(
|
|
|
76
77
|
);
|
|
77
78
|
}
|
|
78
79
|
|
|
80
|
+
// Same check as bid gossip (only_timely=True), not the proposer's full view from validator.md: a list released
|
|
81
|
+
// after the deadline would void every bid, and a high bid that went stale after gossip could crowd out the rest unpaid
|
|
82
|
+
if (isForkPostHeze(fork)) {
|
|
83
|
+
const {inclusionListBits} = bid as heze.ExecutionPayloadBid;
|
|
84
|
+
const inclusionListSlot = bid.slot - 1;
|
|
85
|
+
const dependentRoot = getShufflingDependentRoot(
|
|
86
|
+
chain.forkChoice,
|
|
87
|
+
computeEpochAtSlot(inclusionListSlot),
|
|
88
|
+
computeEpochAtSlot(parentBlock.slot),
|
|
89
|
+
parentBlock
|
|
90
|
+
);
|
|
91
|
+
if (!chain.inclusionListStore.isInclusionListBitsInclusive(inclusionListSlot, dependentRoot, inclusionListBits)) {
|
|
92
|
+
const expectedBits = chain.inclusionListStore.getInclusionListBits(inclusionListSlot, dependentRoot);
|
|
93
|
+
throw Error(
|
|
94
|
+
`Bid inclusionListBits=${toHex(inclusionListBits.uint8Array)} is not inclusive of ` +
|
|
95
|
+
`timely inclusion lists expected=${toHex(expectedBits.uint8Array)}`
|
|
96
|
+
);
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
|
|
79
100
|
const state = await chain.regen
|
|
80
101
|
.getBlockSlotState(parentBlock, slot, {dontTransferCache: true}, RegenCaller.validateGossipExecutionPayloadBid)
|
|
81
102
|
.catch((e: Error) => {
|
|
@@ -7,7 +7,7 @@ import {VersionedHashes} from "./interface.js";
|
|
|
7
7
|
* Skip unrelated fields without decoding or copying them, including untrusted nested access lists.
|
|
8
8
|
* The EL remains responsible for the other transaction validity checks.
|
|
9
9
|
*/
|
|
10
|
-
export function isValidBlobVersionedHashes(transactions: Uint8Array
|
|
10
|
+
export function isValidBlobVersionedHashes(transactions: Iterable<Uint8Array>, expected: VersionedHashes): boolean {
|
|
11
11
|
let index = 0;
|
|
12
12
|
for (const transaction of transactions) {
|
|
13
13
|
if (transaction.length === 0) return false;
|
|
@@ -8,7 +8,7 @@ import {
|
|
|
8
8
|
isForkPostBellatrix,
|
|
9
9
|
isForkPostFulu,
|
|
10
10
|
} from "@lodestar/params";
|
|
11
|
-
import {BlobsBundle, ExecutionPayload, ExecutionRequests, Root, RootHex, Wei} from "@lodestar/types";
|
|
11
|
+
import {BlobsBundle, ExecutionPayload, ExecutionRequests, Root, RootHex, Wei, bellatrix} from "@lodestar/types";
|
|
12
12
|
import {BlobAndProof} from "@lodestar/types/deneb";
|
|
13
13
|
import {BlobAndProofV2} from "@lodestar/types/fulu";
|
|
14
14
|
import {isErrorAborted} from "@lodestar/utils";
|
|
@@ -224,9 +224,13 @@ export class ExecutionEngineHttp implements IExecutionEngine {
|
|
|
224
224
|
executionPayload: ExecutionPayload,
|
|
225
225
|
versionedHashes?: VersionedHashes,
|
|
226
226
|
parentBlockRoot?: Root,
|
|
227
|
-
executionRequests?: ExecutionRequests
|
|
227
|
+
executionRequests?: ExecutionRequests,
|
|
228
|
+
inclusionListTransactions?: bellatrix.Transactions
|
|
228
229
|
): Promise<ExecutePayloadResponse> {
|
|
229
230
|
// Validate before queueing, argument errors must not be reported as an unavailable execution client
|
|
231
|
+
if (ForkSeq[fork] >= ForkSeq.heze && inclusionListTransactions === undefined) {
|
|
232
|
+
throw Error(`inclusionListTransactions required in notifyNewPayload for fork=${fork}`);
|
|
233
|
+
}
|
|
230
234
|
if (ForkSeq[fork] >= ForkSeq.deneb) {
|
|
231
235
|
if (versionedHashes === undefined) {
|
|
232
236
|
throw Error(`versionedHashes required in notifyNewPayload for fork=${fork}`);
|
|
@@ -243,7 +247,14 @@ export class ExecutionEngineHttp implements IExecutionEngine {
|
|
|
243
247
|
try {
|
|
244
248
|
result = await this.enqueue(() =>
|
|
245
249
|
this.withTransport(fork, undefined, (transport) =>
|
|
246
|
-
transport.newPayload(
|
|
250
|
+
transport.newPayload(
|
|
251
|
+
fork,
|
|
252
|
+
executionPayload,
|
|
253
|
+
versionedHashes,
|
|
254
|
+
parentBlockRoot,
|
|
255
|
+
executionRequests,
|
|
256
|
+
inclusionListTransactions
|
|
257
|
+
)
|
|
247
258
|
)
|
|
248
259
|
);
|
|
249
260
|
} catch (e) {
|
|
@@ -264,7 +275,12 @@ export class ExecutionEngineHttp implements IExecutionEngine {
|
|
|
264
275
|
|
|
265
276
|
switch (status) {
|
|
266
277
|
case ExecutionPayloadStatus.VALID:
|
|
267
|
-
return {
|
|
278
|
+
return {
|
|
279
|
+
status,
|
|
280
|
+
latestValidHash: latestValidHash ?? "0x0",
|
|
281
|
+
validationError: null,
|
|
282
|
+
inclusionListSatisfied: result.inclusionListSatisfied ?? null,
|
|
283
|
+
};
|
|
268
284
|
|
|
269
285
|
case ExecutionPayloadStatus.INVALID:
|
|
270
286
|
// As per latest specs if latestValidHash can be null and it would mean only
|
|
@@ -348,7 +364,14 @@ export class ExecutionEngineHttp implements IExecutionEngine {
|
|
|
348
364
|
}
|
|
349
365
|
|
|
350
366
|
const payloadAttributesRpc = serializePayloadAttributes(payloadAttributes);
|
|
351
|
-
this.payloadIdCache.add(
|
|
367
|
+
this.payloadIdCache.add(
|
|
368
|
+
{
|
|
369
|
+
headBlockHash,
|
|
370
|
+
...payloadAttributesRpc,
|
|
371
|
+
inclusionListTransactions: payloadAttributes.inclusionListTransactions,
|
|
372
|
+
},
|
|
373
|
+
payloadId
|
|
374
|
+
);
|
|
352
375
|
void this.prunePayloadIdCache();
|
|
353
376
|
}
|
|
354
377
|
return payloadId;
|
|
@@ -423,6 +446,18 @@ export class ExecutionEngineHttp implements IExecutionEngine {
|
|
|
423
446
|
return this.withTransport(undefined, "v1", (transport) => transport.getBlobsV1(versionedHashes));
|
|
424
447
|
}
|
|
425
448
|
|
|
449
|
+
/**
|
|
450
|
+
* `engine_getInclusionListV1`, JSON-RPC only as the REST engine API defines no inclusion list route.
|
|
451
|
+
* Queued so it runs after the forkchoiceUpdated of a payload imported just before, which prunes that
|
|
452
|
+
* payload's transactions from the mempool the list is built from.
|
|
453
|
+
*/
|
|
454
|
+
async getInclusionList(): Promise<bellatrix.Transactions> {
|
|
455
|
+
return this.enqueue(() => {
|
|
456
|
+
this.metrics?.engineApiRequests.inc({transport: "json-rpc"});
|
|
457
|
+
return this.jsonRpc.getInclusionList();
|
|
458
|
+
});
|
|
459
|
+
}
|
|
460
|
+
|
|
426
461
|
private enqueue<T>(job: () => Promise<T>): Promise<T> {
|
|
427
462
|
return this.queue.push(job) as Promise<T>;
|
|
428
463
|
}
|
|
@@ -9,7 +9,16 @@ import {
|
|
|
9
9
|
ForkPreFulu,
|
|
10
10
|
WITHDRAWAL_REQUEST_TYPE,
|
|
11
11
|
} from "@lodestar/params";
|
|
12
|
-
import {
|
|
12
|
+
import {
|
|
13
|
+
BlobsBundle,
|
|
14
|
+
ExecutionPayload,
|
|
15
|
+
ExecutionRequests,
|
|
16
|
+
Root,
|
|
17
|
+
RootHex,
|
|
18
|
+
Wei,
|
|
19
|
+
bellatrix,
|
|
20
|
+
capella,
|
|
21
|
+
} from "@lodestar/types";
|
|
13
22
|
import {BlobAndProof} from "@lodestar/types/deneb";
|
|
14
23
|
import {BlobAndProofV2} from "@lodestar/types/fulu";
|
|
15
24
|
import {PayloadId, PayloadIdCache, WithdrawalV1} from "./payloadIdCache.js";
|
|
@@ -73,7 +82,13 @@ export type ExecutePayloadResponse =
|
|
|
73
82
|
latestValidHash: null;
|
|
74
83
|
validationError: null;
|
|
75
84
|
}
|
|
76
|
-
| {
|
|
85
|
+
| {
|
|
86
|
+
status: ExecutionPayloadStatus.VALID;
|
|
87
|
+
latestValidHash: RootHex;
|
|
88
|
+
validationError: null;
|
|
89
|
+
/** PayloadStatusV2: whether the payload satisfied the inclusion list constraints */
|
|
90
|
+
inclusionListSatisfied?: boolean | null;
|
|
91
|
+
}
|
|
77
92
|
| {status: ExecutionPayloadStatus.INVALID; latestValidHash: RootHex | null; validationError: string | null}
|
|
78
93
|
| {
|
|
79
94
|
status:
|
|
@@ -99,6 +114,8 @@ export type PayloadAttributes = {
|
|
|
99
114
|
parentBeaconBlockRoot?: Uint8Array;
|
|
100
115
|
slotNumber?: number; // EIP-7843
|
|
101
116
|
targetGasLimit?: bigint; // GLOAS (PayloadAttributesV4, execution-apis#796)
|
|
117
|
+
/** Transactions the built payload must include (PayloadAttributesV5, HEZE:EIP-7805) */
|
|
118
|
+
inclusionListTransactions?: bellatrix.Transactions;
|
|
102
119
|
};
|
|
103
120
|
|
|
104
121
|
export type VersionedHashes = Uint8Array[];
|
|
@@ -129,9 +146,16 @@ export interface IExecutionEngine {
|
|
|
129
146
|
executionPayload: ExecutionPayload,
|
|
130
147
|
versionedHashes?: VersionedHashes,
|
|
131
148
|
parentBeaconBlockRoot?: Root,
|
|
132
|
-
executionRequests?: ExecutionRequests
|
|
149
|
+
executionRequests?: ExecutionRequests,
|
|
150
|
+
inclusionListTransactions?: bellatrix.Transactions
|
|
133
151
|
): Promise<ExecutePayloadResponse>;
|
|
134
152
|
|
|
153
|
+
/**
|
|
154
|
+
* Transactions the execution layer wants included in the next payload. Parameterless since
|
|
155
|
+
* execution-apis#609: the execution layer builds against its own view of the head.
|
|
156
|
+
*/
|
|
157
|
+
getInclusionList(): Promise<bellatrix.Transactions>;
|
|
158
|
+
|
|
135
159
|
/**
|
|
136
160
|
* Signal fork choice updates
|
|
137
161
|
* This function performs two actions atomically:
|
|
@@ -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;
|