@lodestar/beacon-node 1.51.0-dev.2b933d3b9a → 1.51.0-dev.312812503e
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/validator/index.js +7 -5
- package/lib/api/impl/validator/index.js.map +1 -1
- package/lib/api/options.d.ts +2 -0
- package/lib/api/options.d.ts.map +1 -1
- package/lib/api/options.js +1 -0
- package/lib/api/options.js.map +1 -1
- package/lib/chain/blocks/importExecutionPayload.d.ts.map +1 -1
- package/lib/chain/blocks/importExecutionPayload.js +2 -1
- package/lib/chain/blocks/importExecutionPayload.js.map +1 -1
- package/lib/chain/opPools/inclusionListStore.d.ts.map +1 -1
- package/lib/chain/opPools/inclusionListStore.js +2 -2
- package/lib/chain/opPools/inclusionListStore.js.map +1 -1
- package/lib/chain/produceBlock/produceBlockBody.d.ts.map +1 -1
- package/lib/chain/produceBlock/produceBlockBody.js +0 -1
- package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
- package/lib/chain/regen/interface.d.ts +0 -1
- package/lib/chain/regen/interface.d.ts.map +1 -1
- package/lib/chain/regen/interface.js +0 -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 +0 -153
- package/lib/chain/validation/executionPayloadBid.js.map +1 -1
- package/lib/chain/validation/inclusionList.d.ts.map +1 -1
- package/lib/chain/validation/inclusionList.js +11 -2
- package/lib/chain/validation/inclusionList.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/http.d.ts.map +1 -1
- package/lib/execution/engine/http.js +0 -1
- package/lib/execution/engine/http.js.map +1 -1
- package/lib/execution/engine/mock.d.ts.map +1 -1
- package/lib/execution/engine/mock.js +6 -4
- package/lib/execution/engine/mock.js.map +1 -1
- package/lib/execution/engine/payloadIdCache.d.ts +1 -2
- package/lib/execution/engine/payloadIdCache.d.ts.map +1 -1
- package/lib/execution/engine/payloadIdCache.js +3 -3
- package/lib/execution/engine/payloadIdCache.js.map +1 -1
- package/lib/execution/engine/sszTypes.d.ts +38 -38
- package/lib/execution/engine/types.d.ts +1 -1
- package/lib/execution/engine/types.d.ts.map +1 -1
- package/lib/execution/engine/types.js +7 -6
- package/lib/execution/engine/types.js.map +1 -1
- package/lib/metrics/metrics/lodestar.d.ts +3 -0
- package/lib/metrics/metrics/lodestar.d.ts.map +1 -1
- package/lib/metrics/metrics/lodestar.js +5 -0
- package/lib/metrics/metrics/lodestar.js.map +1 -1
- package/lib/network/gossip/topic.d.ts +6 -6
- package/lib/network/processor/gossipHandlers.d.ts.map +1 -1
- package/lib/network/processor/gossipHandlers.js +27 -18
- package/lib/network/processor/gossipHandlers.js.map +1 -1
- package/lib/network/processor/index.d.ts.map +1 -1
- package/lib/network/processor/index.js +26 -25
- package/lib/network/processor/index.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/validator/index.ts +7 -7
- package/src/api/options.ts +3 -0
- package/src/chain/blocks/importExecutionPayload.ts +2 -1
- package/src/chain/opPools/inclusionListStore.ts +3 -3
- package/src/chain/produceBlock/produceBlockBody.ts +0 -1
- package/src/chain/regen/interface.ts +0 -1
- package/src/chain/validation/executionPayloadBid.ts +0 -180
- package/src/chain/validation/inclusionList.ts +11 -2
- package/src/execution/engine/blobVersionedHashes.ts +1 -1
- package/src/execution/engine/http.ts +0 -1
- package/src/execution/engine/mock.ts +6 -4
- package/src/execution/engine/payloadIdCache.ts +6 -7
- package/src/execution/engine/types.ts +8 -8
- package/src/metrics/metrics/lodestar.ts +5 -0
- package/src/network/processor/gossipHandlers.ts +35 -20
- package/src/network/processor/index.ts +22 -23
- package/src/network/processor/types.ts +1 -1
- package/src/sync/unknownBlock.ts +47 -28
|
@@ -62,7 +62,7 @@ import {
|
|
|
62
62
|
} from "../../../../chain/produceBlock/index.js";
|
|
63
63
|
import {RegenCaller} from "../../../../chain/regen/index.js";
|
|
64
64
|
import {validateGossipBlock, verifyBlockProposerSignature} from "../../../../chain/validation/block.js";
|
|
65
|
-
import {
|
|
65
|
+
import {validateGossipExecutionPayloadBid} from "../../../../chain/validation/executionPayloadBid.js";
|
|
66
66
|
import {validateApiExecutionPayloadEnvelope} from "../../../../chain/validation/executionPayloadEnvelope.js";
|
|
67
67
|
import {OpSource} from "../../../../chain/validatorMonitor.js";
|
|
68
68
|
import {
|
|
@@ -79,6 +79,7 @@ import {
|
|
|
79
79
|
import {isOptimisticBlock} from "../../../../util/forkChoice.js";
|
|
80
80
|
import {kzg} from "../../../../util/kzg.js";
|
|
81
81
|
import {promiseAllMaybeAsync} from "../../../../util/promises.js";
|
|
82
|
+
import {ApiOptions} from "../../../options.js";
|
|
82
83
|
import {ApiModules} from "../../types.js";
|
|
83
84
|
import {assertUniqueItems} from "../../utils.js";
|
|
84
85
|
import {getBlockResponse, toBeaconHeaderResponse} from "./utils.js";
|
|
@@ -96,16 +97,10 @@ const MAX_API_CLOCK_DISPARITY_MS = 1000;
|
|
|
96
97
|
*/
|
|
97
98
|
const IDENTITY_PEER_ID = ""; // TODO: Compute identity keypair
|
|
98
99
|
|
|
99
|
-
export function getBeaconBlockApi(
|
|
100
|
-
|
|
101
|
-
config,
|
|
102
|
-
|
|
103
|
-
network,
|
|
104
|
-
db,
|
|
105
|
-
}: Pick<
|
|
106
|
-
ApiModules,
|
|
107
|
-
"chain" | "config" | "metrics" | "network" | "db"
|
|
108
|
-
>): ApplicationMethods<routes.beacon.block.Endpoints> {
|
|
100
|
+
export function getBeaconBlockApi(
|
|
101
|
+
opts: ApiOptions,
|
|
102
|
+
{chain, config, metrics, network, db}: Pick<ApiModules, "chain" | "config" | "metrics" | "network" | "db">
|
|
103
|
+
): ApplicationMethods<routes.beacon.block.Endpoints> {
|
|
109
104
|
const publishBlockV2: ApplicationMethods<routes.beacon.block.Endpoints>["publishBlockV2"] = async (
|
|
110
105
|
{signedBlockContents, broadcastValidation, builderUrl},
|
|
111
106
|
context,
|
|
@@ -1077,15 +1072,25 @@ export function getBeaconBlockApi({
|
|
|
1077
1072
|
throw new ApiError(400, `publishExecutionPayloadBid not supported for pre-gloas fork=${fork}`);
|
|
1078
1073
|
}
|
|
1079
1074
|
|
|
1080
|
-
const validationTimer = metrics?.opPool.executionPayloadBidPool.apiValidationTime.startTimer();
|
|
1081
|
-
// TODO: once the builder is tested and can be trusted, skip this local validation
|
|
1082
|
-
// to publish faster, accepting peer-score risk if it ever emits an invalid bid.
|
|
1083
|
-
await validateApiExecutionPayloadBid(chain, signedExecutionPayloadBid);
|
|
1084
|
-
validationTimer?.();
|
|
1085
|
-
|
|
1086
1075
|
const elapsedSec = chain.clock.secFromSlot(slot, seenTimestampSec);
|
|
1087
1076
|
metrics?.gossipExecutionPayloadBid.elapsedTimeTillReceived.observe({source: OpSource.api}, elapsedSec);
|
|
1088
1077
|
|
|
1078
|
+
if (!opts.disableBidValidation) {
|
|
1079
|
+
const validationTimer = metrics?.opPool.executionPayloadBidPool.apiValidationTime.startTimer();
|
|
1080
|
+
const {proposerIndex} = await validateGossipExecutionPayloadBid(chain, signedExecutionPayloadBid);
|
|
1081
|
+
validationTimer?.();
|
|
1082
|
+
|
|
1083
|
+
// Gossip does not deliver our own messages back to us, so a validated bid is added to the
|
|
1084
|
+
// pool here to allow a proposer on this node to select it
|
|
1085
|
+
const insertOutcome = chain.executionPayloadBidPool.add(
|
|
1086
|
+
signedExecutionPayloadBid,
|
|
1087
|
+
Math.floor(elapsedSec * 1000)
|
|
1088
|
+
);
|
|
1089
|
+
metrics?.opPool.executionPayloadBidPool.apiInsertOutcome.inc({insertOutcome});
|
|
1090
|
+
|
|
1091
|
+
chain.validatorMonitor?.registerExecutionPayloadBid(OpSource.api, proposerIndex, bid);
|
|
1092
|
+
}
|
|
1093
|
+
|
|
1089
1094
|
const sentPeers = await network.publishSignedExecutionPayloadBid(signedExecutionPayloadBid);
|
|
1090
1095
|
|
|
1091
1096
|
chain.emitter.emit(routes.events.EventType.executionPayloadBid, {
|
|
@@ -3,6 +3,7 @@ import {ApplicationMethods} from "@lodestar/api/server";
|
|
|
3
3
|
import {isForkPostGloas} from "@lodestar/params";
|
|
4
4
|
import {computeStartSlotAtEpoch} from "@lodestar/state-transition";
|
|
5
5
|
import {toRootHex} from "@lodestar/utils";
|
|
6
|
+
import {ApiOptions} from "../../options.js";
|
|
6
7
|
import {ApiError} from "../errors.js";
|
|
7
8
|
import {ApiModules} from "../types.js";
|
|
8
9
|
import {getBeaconBlockApi} from "./blocks/index.js";
|
|
@@ -11,9 +12,10 @@ import {getBeaconRewardsApi} from "./rewards/index.js";
|
|
|
11
12
|
import {getBeaconStateApi} from "./state/index.js";
|
|
12
13
|
|
|
13
14
|
export function getBeaconApi(
|
|
15
|
+
opts: ApiOptions,
|
|
14
16
|
modules: Pick<ApiModules, "chain" | "config" | "logger" | "metrics" | "network" | "db" | "sync">
|
|
15
17
|
): ApplicationMethods<routes.beacon.Endpoints> {
|
|
16
|
-
const block = getBeaconBlockApi(modules);
|
|
18
|
+
const block = getBeaconBlockApi(opts, modules);
|
|
17
19
|
const pool = getBeaconPoolApi(modules);
|
|
18
20
|
const state = getBeaconStateApi(modules);
|
|
19
21
|
const rewards = getBeaconRewardsApi(modules);
|
|
@@ -254,13 +254,13 @@ export function getValidatorApi(
|
|
|
254
254
|
genesisBlockRoot = state.computeAnchorCheckpoint().checkpoint.root;
|
|
255
255
|
} else if (state.slot < SLOTS_PER_HISTORICAL_ROOT) {
|
|
256
256
|
genesisBlockRoot = state.getBlockRootAtSlot(GENESIS_SLOT);
|
|
257
|
-
}
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
257
|
+
} else {
|
|
258
|
+
const blockRes = await chain.getCanonicalBlockAtSlot(GENESIS_SLOT);
|
|
259
|
+
if (blockRes) {
|
|
260
|
+
genesisBlockRoot = config
|
|
261
|
+
.getForkTypes(blockRes.block.message.slot)
|
|
262
|
+
.BeaconBlock.hashTreeRoot(blockRes.block.message);
|
|
263
|
+
}
|
|
264
264
|
}
|
|
265
265
|
}
|
|
266
266
|
|
package/src/api/options.ts
CHANGED
|
@@ -2,6 +2,8 @@ import {BeaconRestApiServerOpts, beaconRestApiServerOpts} from "./rest/index.js"
|
|
|
2
2
|
|
|
3
3
|
export type ApiOptions = {
|
|
4
4
|
maxGindicesInProof?: number;
|
|
5
|
+
/** Broadcast execution payload bids submitted via the API without running gossip validation */
|
|
6
|
+
disableBidValidation?: boolean;
|
|
5
7
|
rest: BeaconRestApiServerOpts;
|
|
6
8
|
commit?: string;
|
|
7
9
|
version?: string;
|
|
@@ -10,6 +12,7 @@ export type ApiOptions = {
|
|
|
10
12
|
|
|
11
13
|
export const defaultApiOptions: ApiOptions = {
|
|
12
14
|
maxGindicesInProof: 512,
|
|
15
|
+
disableBidValidation: false,
|
|
13
16
|
rest: beaconRestApiServerOpts,
|
|
14
17
|
version: "dev",
|
|
15
18
|
private: false,
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import {SerializedList} from "@chainsafe/ssz";
|
|
1
2
|
import {routes} from "@lodestar/api";
|
|
2
3
|
import {
|
|
3
4
|
ExecutionStatus,
|
|
@@ -206,7 +207,7 @@ export async function importExecutionPayload(
|
|
|
206
207
|
}
|
|
207
208
|
inclusionListTransactions =
|
|
208
209
|
dependentRoot === null
|
|
209
|
-
?
|
|
210
|
+
? SerializedList.empty()
|
|
210
211
|
: this.inclusionListStore.getInclusionListTransactions(inclusionListSlot, dependentRoot, true);
|
|
211
212
|
}
|
|
212
213
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {BitArray} from "@chainsafe/ssz";
|
|
1
|
+
import {BitArray, SerializedList} from "@chainsafe/ssz";
|
|
2
2
|
import {BeaconConfig} from "@lodestar/config";
|
|
3
3
|
import {INCLUSION_LIST_COMMITTEE_SIZE} from "@lodestar/params";
|
|
4
4
|
import {RootHex, Slot, ValidatorIndex, bellatrix, heze, ssz} from "@lodestar/types";
|
|
@@ -108,7 +108,7 @@ export class InclusionListStore {
|
|
|
108
108
|
|
|
109
109
|
/** Deduplicated transactions from valid, non-equivocating inclusion lists at `(slot, dependentRoot)`. */
|
|
110
110
|
getInclusionListTransactions(slot: Slot, dependentRoot: RootHex, onlyTimely = true): bellatrix.Transactions {
|
|
111
|
-
const transactions:
|
|
111
|
+
const transactions: Uint8Array[] = [];
|
|
112
112
|
const seen = new Set<string>();
|
|
113
113
|
|
|
114
114
|
for (const {signedInclusionList} of this.getEligible(slot, dependentRoot, onlyTimely)) {
|
|
@@ -121,7 +121,7 @@ export class InclusionListStore {
|
|
|
121
121
|
}
|
|
122
122
|
}
|
|
123
123
|
|
|
124
|
-
return transactions;
|
|
124
|
+
return SerializedList.fromArray(transactions);
|
|
125
125
|
}
|
|
126
126
|
|
|
127
127
|
/** Bit `i` is set when committee member `i` submitted a valid, non-equivocating inclusion list */
|
|
@@ -781,7 +781,6 @@ export async function prepareExecutionPayload(
|
|
|
781
781
|
|
|
782
782
|
const payloadIdCached = chain.executionEngine.payloadIdCache.get({
|
|
783
783
|
headBlockHash: toRootHex(parentBlockHash),
|
|
784
|
-
finalizedBlockHash,
|
|
785
784
|
timestamp: numToQuantity(timestamp),
|
|
786
785
|
prevRandao: toHex(prevRandao),
|
|
787
786
|
suggestedFeeRecipient,
|
|
@@ -25,7 +25,6 @@ export enum RegenCaller {
|
|
|
25
25
|
publishDeferredVoluntaryExits = "publishDeferredVoluntaryExits",
|
|
26
26
|
validateGossipExecutionPayloadBid = "validateGossipExecutionPayloadBid",
|
|
27
27
|
validateGossipInclusionList = "validateGossipInclusionList",
|
|
28
|
-
validateApiExecutionPayloadBid = "validateApiExecutionPayloadBid",
|
|
29
28
|
validateGossipPayloadAttestationMessage = "validateGossipPayloadAttestationMessage",
|
|
30
29
|
validateGossipProposerPreferences = "validateGossipProposerPreferences",
|
|
31
30
|
onForkChoiceFinalized = "onForkChoiceFinalized",
|
|
@@ -83,186 +83,6 @@ function isBidCompatibleWithHead(
|
|
|
83
83
|
return buildsOnParentPayload;
|
|
84
84
|
}
|
|
85
85
|
|
|
86
|
-
/**
|
|
87
|
-
* Validation for bids submitted via the API by the operator's own builder.
|
|
88
|
-
*
|
|
89
|
-
* Only non-transient checks are applied: slot later than parent, zero execution payment, blob
|
|
90
|
-
* commitment count, builder eligibility, version and balance coverage, prev_randao, and signature.
|
|
91
|
-
* Transient gossip rules (head compatibility, first bid per tuple, value increment, proposer
|
|
92
|
-
* preferences) are not applied, since those only limit forwarding of peers' messages and the
|
|
93
|
-
* builder may legitimately bid on a branch this node does not consider head.
|
|
94
|
-
* The parent-payload builder-exit rule is omitted because this endpoint only accepts bids from
|
|
95
|
-
* the operator's own builder.
|
|
96
|
-
*
|
|
97
|
-
* Throws on any failed check. Also throws if the bid's parent block is unknown or its state is
|
|
98
|
-
* unavailable, since the checks cannot be evaluated against the parent branch.
|
|
99
|
-
*/
|
|
100
|
-
export async function validateApiExecutionPayloadBid(
|
|
101
|
-
chain: IBeaconChain,
|
|
102
|
-
signedExecutionPayloadBid: gloas.SignedExecutionPayloadBid
|
|
103
|
-
): Promise<void> {
|
|
104
|
-
const bid = signedExecutionPayloadBid.message;
|
|
105
|
-
const bidParentBlockRoot = toRootHex(bid.parentBlockRoot);
|
|
106
|
-
|
|
107
|
-
// [REJECT] `bid.execution_payment` is zero.
|
|
108
|
-
if (bid.executionPayment !== 0n) {
|
|
109
|
-
throw new ExecutionPayloadBidError(GossipAction.REJECT, {
|
|
110
|
-
code: ExecutionPayloadBidErrorCode.NON_ZERO_EXECUTION_PAYMENT,
|
|
111
|
-
builderIndex: bid.builderIndex,
|
|
112
|
-
executionPayment: bid.executionPayment,
|
|
113
|
-
});
|
|
114
|
-
}
|
|
115
|
-
|
|
116
|
-
// [REJECT] The bid's block hash is not equal to its parent block hash -- i.e.
|
|
117
|
-
// `bid.block_hash != bid.parent_block_hash`.
|
|
118
|
-
if (byteArrayEquals(bid.blockHash, bid.parentBlockHash)) {
|
|
119
|
-
throw new ExecutionPayloadBidError(GossipAction.REJECT, {
|
|
120
|
-
code: ExecutionPayloadBidErrorCode.BLOCK_HASH_EQUALS_PARENT_BLOCK_HASH,
|
|
121
|
-
blockHash: toRootHex(bid.blockHash),
|
|
122
|
-
});
|
|
123
|
-
}
|
|
124
|
-
|
|
125
|
-
// [REJECT] The length of KZG commitments is less than or equal to the limitation defined in the
|
|
126
|
-
// consensus layer -- i.e. validate that
|
|
127
|
-
// `len(bid.blob_kzg_commitments) <= get_blob_parameters(compute_epoch_at_slot(bid.slot)).max_blobs_per_block`.
|
|
128
|
-
const blobKzgCommitmentsLen = bid.blobKzgCommitments.length;
|
|
129
|
-
const maxBlobsPerBlock = chain.config.getMaxBlobsPerBlock(computeEpochAtSlot(bid.slot));
|
|
130
|
-
if (blobKzgCommitmentsLen > maxBlobsPerBlock) {
|
|
131
|
-
throw new ExecutionPayloadBidError(GossipAction.REJECT, {
|
|
132
|
-
code: ExecutionPayloadBidErrorCode.TOO_MANY_KZG_COMMITMENTS,
|
|
133
|
-
blobKzgCommitmentsLen,
|
|
134
|
-
commitmentLimit: maxBlobsPerBlock,
|
|
135
|
-
});
|
|
136
|
-
}
|
|
137
|
-
|
|
138
|
-
// [IGNORE] `bid.slot` is the current slot, or the next slot (`bid.slot - 1` is current), allowing for `MAXIMUM_GOSSIP_CLOCK_DISPARITY`.
|
|
139
|
-
if (
|
|
140
|
-
!chain.clock.isCurrentSlotGivenGossipDisparity(bid.slot) &&
|
|
141
|
-
!chain.clock.isCurrentSlotGivenGossipDisparity(bid.slot - 1)
|
|
142
|
-
) {
|
|
143
|
-
throw new ExecutionPayloadBidError(GossipAction.IGNORE, {
|
|
144
|
-
code: ExecutionPayloadBidErrorCode.INVALID_SLOT,
|
|
145
|
-
builderIndex: bid.builderIndex,
|
|
146
|
-
slot: bid.slot,
|
|
147
|
-
});
|
|
148
|
-
}
|
|
149
|
-
|
|
150
|
-
// [IGNORE] The bid is received after the inclusion list deadline of `bid.slot - 1`
|
|
151
|
-
if (
|
|
152
|
-
isForkPostHeze(chain.config.getForkName(bid.slot)) &&
|
|
153
|
-
chain.clock.msFromSlot(bid.slot - 1) < chain.config.getInclusionListDueMs(chain.config.getForkName(bid.slot - 1))
|
|
154
|
-
) {
|
|
155
|
-
throw new ExecutionPayloadBidError(GossipAction.IGNORE, {
|
|
156
|
-
code: ExecutionPayloadBidErrorCode.BEFORE_INCLUSION_LIST_DEADLINE,
|
|
157
|
-
builderIndex: bid.builderIndex,
|
|
158
|
-
slot: bid.slot,
|
|
159
|
-
});
|
|
160
|
-
}
|
|
161
|
-
|
|
162
|
-
// [IGNORE] `bid.parent_block_root` is the hash tree root of a known beacon block in fork choice.
|
|
163
|
-
// Moved earlier than the spec ordering so we can derive the proposer dependent root for the
|
|
164
|
-
// proposer-preferences lookup below from a known fork-choice block.
|
|
165
|
-
const parentBlock = chain.forkChoice.getBlockHexDefaultStatus(bidParentBlockRoot);
|
|
166
|
-
if (parentBlock === null) {
|
|
167
|
-
throw new ExecutionPayloadBidError(GossipAction.IGNORE, {
|
|
168
|
-
code: ExecutionPayloadBidErrorCode.UNKNOWN_BLOCK_ROOT,
|
|
169
|
-
parentBlockRoot: bidParentBlockRoot,
|
|
170
|
-
});
|
|
171
|
-
}
|
|
172
|
-
|
|
173
|
-
// [REJECT] The bid is for a higher slot than its parent block -- i.e.
|
|
174
|
-
// validate that `bid.slot` is greater than the slot of the block with root
|
|
175
|
-
// `bid.parent_block_root`.
|
|
176
|
-
if (bid.slot <= parentBlock.slot) {
|
|
177
|
-
throw new ExecutionPayloadBidError(GossipAction.REJECT, {
|
|
178
|
-
code: ExecutionPayloadBidErrorCode.NOT_LATER_THAN_PARENT,
|
|
179
|
-
parentSlot: parentBlock.slot,
|
|
180
|
-
slot: bid.slot,
|
|
181
|
-
});
|
|
182
|
-
}
|
|
183
|
-
|
|
184
|
-
const state = await chain.regen
|
|
185
|
-
.getBlockSlotState(parentBlock, bid.slot, {dontTransferCache: true}, RegenCaller.validateApiExecutionPayloadBid)
|
|
186
|
-
.catch(() => {
|
|
187
|
-
throw new ExecutionPayloadBidError(GossipAction.IGNORE, {
|
|
188
|
-
code: ExecutionPayloadBidErrorCode.UNKNOWN_BLOCK_ROOT,
|
|
189
|
-
parentBlockRoot: bidParentBlockRoot,
|
|
190
|
-
});
|
|
191
|
-
});
|
|
192
|
-
|
|
193
|
-
if (!isStatePostGloas(state)) {
|
|
194
|
-
throw new Error(`Expected gloas+ state for execution payload bid validation, got fork=${state.forkName}`);
|
|
195
|
-
}
|
|
196
|
-
|
|
197
|
-
// [REJECT] `bid.builder_index` is within bounds -- i.e. `bid.builder_index < len(state.builders)`.
|
|
198
|
-
// `state.getBuilder` returns a lazy SSZ `getReadonly` view that is not bounds-checked eagerly; an
|
|
199
|
-
// out-of-range index only throws (`LeafNode has no right node`) on deferred field access (e.g. inside
|
|
200
|
-
// `isActiveBuilder`), escaping a try/catch around `getBuilder`. Check the length explicitly instead.
|
|
201
|
-
if (bid.builderIndex >= state.getBuildersLength()) {
|
|
202
|
-
throw new ExecutionPayloadBidError(GossipAction.REJECT, {
|
|
203
|
-
code: ExecutionPayloadBidErrorCode.BUILDER_NOT_ELIGIBLE,
|
|
204
|
-
builderIndex: bid.builderIndex,
|
|
205
|
-
});
|
|
206
|
-
}
|
|
207
|
-
|
|
208
|
-
// [REJECT] `bid.builder_index` is a valid/active builder index -- i.e.
|
|
209
|
-
// `is_active_builder(state, bid.builder_index)` returns `True`.
|
|
210
|
-
const builder = state.getBuilder(bid.builderIndex);
|
|
211
|
-
if (!isActiveBuilder(builder, state.finalizedCheckpoint.epoch)) {
|
|
212
|
-
throw new ExecutionPayloadBidError(GossipAction.REJECT, {
|
|
213
|
-
code: ExecutionPayloadBidErrorCode.BUILDER_NOT_ELIGIBLE,
|
|
214
|
-
builderIndex: bid.builderIndex,
|
|
215
|
-
});
|
|
216
|
-
}
|
|
217
|
-
|
|
218
|
-
// [REJECT] The builder version is `PAYLOAD_BUILDER_VERSION` -- i.e.
|
|
219
|
-
// `state.builders[bid.builder_index].version == PAYLOAD_BUILDER_VERSION`.
|
|
220
|
-
if (builder.version !== PAYLOAD_BUILDER_VERSION) {
|
|
221
|
-
throw new ExecutionPayloadBidError(GossipAction.REJECT, {
|
|
222
|
-
code: ExecutionPayloadBidErrorCode.INVALID_BUILDER_VERSION,
|
|
223
|
-
builderIndex: bid.builderIndex,
|
|
224
|
-
version: builder.version,
|
|
225
|
-
expectedVersion: PAYLOAD_BUILDER_VERSION,
|
|
226
|
-
});
|
|
227
|
-
}
|
|
228
|
-
|
|
229
|
-
// [IGNORE] `bid.value` is less or equal than the builder's excess balance --
|
|
230
|
-
// i.e. `can_builder_cover_bid(state, builder_index, amount)` returns `True`.
|
|
231
|
-
if (!state.canBuilderCoverBid(bid.builderIndex, bid.value)) {
|
|
232
|
-
throw new ExecutionPayloadBidError(GossipAction.IGNORE, {
|
|
233
|
-
code: ExecutionPayloadBidErrorCode.BID_TOO_HIGH,
|
|
234
|
-
bidValue: bid.value,
|
|
235
|
-
builderBalance: builder.balance,
|
|
236
|
-
});
|
|
237
|
-
}
|
|
238
|
-
|
|
239
|
-
// [REJECT] `bid.prev_randao` is the correct RANDAO mix -- i.e. validate that
|
|
240
|
-
// `bid.prev_randao == get_randao_mix(parent_state, get_current_epoch(parent_state))`.
|
|
241
|
-
const randaoMix = state.getRandaoMix(computeEpochAtSlot(state.slot));
|
|
242
|
-
if (!byteArrayEquals(bid.prevRandao, randaoMix)) {
|
|
243
|
-
throw new ExecutionPayloadBidError(GossipAction.REJECT, {
|
|
244
|
-
code: ExecutionPayloadBidErrorCode.INVALID_PREV_RANDAO,
|
|
245
|
-
builderIndex: bid.builderIndex,
|
|
246
|
-
bidPrevRandao: toHex(bid.prevRandao),
|
|
247
|
-
expectedPrevRandao: toHex(randaoMix),
|
|
248
|
-
});
|
|
249
|
-
}
|
|
250
|
-
|
|
251
|
-
// [REJECT] `signed_execution_payload_bid.signature` is valid with respect to the `bid.builder_index`.
|
|
252
|
-
const signatureSet = createSingleSignatureSetFromComponents(
|
|
253
|
-
builder.pubkey,
|
|
254
|
-
getExecutionPayloadBidSigningRoot(chain.config, bid),
|
|
255
|
-
signedExecutionPayloadBid.signature
|
|
256
|
-
);
|
|
257
|
-
if (!(await chain.bls.verifySignatureSets([signatureSet]))) {
|
|
258
|
-
throw new ExecutionPayloadBidError(GossipAction.REJECT, {
|
|
259
|
-
code: ExecutionPayloadBidErrorCode.INVALID_SIGNATURE,
|
|
260
|
-
builderIndex: bid.builderIndex,
|
|
261
|
-
slot: bid.slot,
|
|
262
|
-
});
|
|
263
|
-
}
|
|
264
|
-
}
|
|
265
|
-
|
|
266
86
|
export async function validateGossipExecutionPayloadBid(
|
|
267
87
|
chain: IBeaconChain,
|
|
268
88
|
signedExecutionPayloadBid: gloas.SignedExecutionPayloadBid
|
|
@@ -31,7 +31,10 @@ export async function validateGossipInclusionList(
|
|
|
31
31
|
signedInclusionList: heze.SignedInclusionList
|
|
32
32
|
): Promise<InclusionListValidationResult> {
|
|
33
33
|
const {slot, validatorIndex, transactions, dependentRoot} = signedInclusionList.message;
|
|
34
|
-
|
|
34
|
+
let totalBytes = 0;
|
|
35
|
+
for (let i = 0; i < transactions.length; i++) {
|
|
36
|
+
totalBytes += transactions.getSize(i);
|
|
37
|
+
}
|
|
35
38
|
|
|
36
39
|
// A pre-heze slot has no inclusion list committee to validate against
|
|
37
40
|
if (!isForkPostHeze(chain.config.getForkName(slot))) {
|
|
@@ -75,7 +78,13 @@ export async function validateGossipInclusionList(
|
|
|
75
78
|
}
|
|
76
79
|
|
|
77
80
|
// [REJECT] Every transaction in message.transactions is non-empty
|
|
78
|
-
|
|
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
|
+
}
|
|
79
88
|
if (emptyTransactionIndex !== -1) {
|
|
80
89
|
throw new InclusionListError(GossipAction.REJECT, {
|
|
81
90
|
code: InclusionListErrorCode.EMPTY_TRANSACTION,
|
|
@@ -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;
|
|
@@ -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,
|
|
@@ -352,14 +353,14 @@ export class ExecutionEngineMockBackend implements JsonRpcBackend {
|
|
|
352
353
|
executionPayload.gasUsed = Math.floor(0.5 * INTEROP_GAS_LIMIT);
|
|
353
354
|
executionPayload.timestamp = payloadAttributes.timestamp;
|
|
354
355
|
executionPayload.blockHash = crypto.randomBytes(32);
|
|
355
|
-
|
|
356
|
+
const transactions: Uint8Array[] = [];
|
|
356
357
|
|
|
357
358
|
// Between 0 and 4 transactions for all forks
|
|
358
359
|
const eip1559TxCount = Math.round(4 * Math.random());
|
|
359
360
|
for (let i = 0; i < eip1559TxCount; i++) {
|
|
360
361
|
const tx = crypto.randomBytes(512);
|
|
361
362
|
tx[0] = TX_TYPE_EIP1559;
|
|
362
|
-
|
|
363
|
+
transactions.push(tx);
|
|
363
364
|
}
|
|
364
365
|
|
|
365
366
|
const commitments: deneb.KZGCommitment[] = [];
|
|
@@ -373,7 +374,7 @@ export class ExecutionEngineMockBackend implements JsonRpcBackend {
|
|
|
373
374
|
const blob = generateRandomBlob();
|
|
374
375
|
const commitment = kzg.blobToKzgCommitment(blob);
|
|
375
376
|
const {proofs: cellProofs} = kzg.computeCellsAndKzgProofs(blob);
|
|
376
|
-
|
|
377
|
+
transactions.push(transactionForKzgCommitment(commitment));
|
|
377
378
|
commitments.push(commitment);
|
|
378
379
|
blobs.push(blob);
|
|
379
380
|
proofs.push(...cellProofs);
|
|
@@ -385,12 +386,13 @@ export class ExecutionEngineMockBackend implements JsonRpcBackend {
|
|
|
385
386
|
const blob = generateRandomBlob();
|
|
386
387
|
const commitment = kzg.blobToKzgCommitment(blob);
|
|
387
388
|
const proof = kzg.computeBlobKzgProof(blob, commitment);
|
|
388
|
-
|
|
389
|
+
transactions.push(transactionForKzgCommitment(commitment));
|
|
389
390
|
commitments.push(commitment);
|
|
390
391
|
blobs.push(blob);
|
|
391
392
|
proofs.push(proof);
|
|
392
393
|
}
|
|
393
394
|
}
|
|
395
|
+
executionPayload.transactions = SerializedList.fromArray(transactions);
|
|
394
396
|
|
|
395
397
|
if (ForkSeq[fork] >= ForkSeq.capella) {
|
|
396
398
|
(executionPayload as ExecutionPayload<ForkPostCapella>).withdrawals = ssz.capella.Withdrawals.defaultValue();
|
|
@@ -19,10 +19,9 @@ export type WithdrawalV1 = {
|
|
|
19
19
|
amount: QUANTITY;
|
|
20
20
|
};
|
|
21
21
|
|
|
22
|
-
type FcuAttributes = {headBlockHash: DATA
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
> & {inclusionListTransactions?: bellatrix.Transactions};
|
|
22
|
+
type FcuAttributes = {headBlockHash: DATA} & Omit<PayloadAttributesRpc, "withdrawals" | "inclusionListTransactions"> & {
|
|
23
|
+
inclusionListTransactions?: bellatrix.Transactions;
|
|
24
|
+
};
|
|
26
25
|
|
|
27
26
|
export class PayloadIdCache {
|
|
28
27
|
private readonly payloadIdByFcuAttributes = new Map<
|
|
@@ -30,8 +29,8 @@ export class PayloadIdCache {
|
|
|
30
29
|
{payloadId: PayloadId; fullKey: string; inclusionListTransactions?: bellatrix.Transactions}
|
|
31
30
|
>();
|
|
32
31
|
|
|
33
|
-
getFullKey({headBlockHash,
|
|
34
|
-
return `${headBlockHash}-${
|
|
32
|
+
getFullKey({headBlockHash, timestamp, prevRandao, suggestedFeeRecipient}: FcuAttributes): string {
|
|
33
|
+
return `${headBlockHash}-${timestamp}-${prevRandao}-${suggestedFeeRecipient}`;
|
|
35
34
|
}
|
|
36
35
|
getKey({timestamp}: Pick<FcuAttributes, "timestamp">): string {
|
|
37
36
|
return timestamp;
|
|
@@ -69,5 +68,5 @@ function isSameInclusionList(a?: bellatrix.Transactions, b?: bellatrix.Transacti
|
|
|
69
68
|
if (a === undefined || b === undefined) {
|
|
70
69
|
return a === b;
|
|
71
70
|
}
|
|
72
|
-
return a.
|
|
71
|
+
return byteArrayEquals(a.bytes, b.bytes);
|
|
73
72
|
}
|
|
@@ -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,
|
|
@@ -181,7 +181,7 @@ export type ExecutionPayloadBodyRpc = {
|
|
|
181
181
|
};
|
|
182
182
|
|
|
183
183
|
export type ExecutionPayloadBody = {
|
|
184
|
-
transactions: bellatrix.
|
|
184
|
+
transactions: bellatrix.Transactions;
|
|
185
185
|
withdrawals: capella.Withdrawals | null;
|
|
186
186
|
};
|
|
187
187
|
|
|
@@ -316,7 +316,7 @@ export function serializeExecutionPayload(fork: ForkName, data: ExecutionPayload
|
|
|
316
316
|
extraData: bytesToData(data.extraData),
|
|
317
317
|
baseFeePerGas: numToQuantity(data.baseFeePerGas),
|
|
318
318
|
blockHash: bytesToData(data.blockHash),
|
|
319
|
-
transactions: data.transactions
|
|
319
|
+
transactions: Array.from(data.transactions, (tran) => bytesToData(tran)),
|
|
320
320
|
};
|
|
321
321
|
|
|
322
322
|
// Capella adds withdrawals to the ExecutionPayload
|
|
@@ -400,7 +400,7 @@ export function parseExecutionPayload(
|
|
|
400
400
|
extraData: dataToBytes(data.extraData, null),
|
|
401
401
|
baseFeePerGas: quantityToBigint(data.baseFeePerGas),
|
|
402
402
|
blockHash: dataToBytes(data.blockHash, 32),
|
|
403
|
-
transactions: data.transactions.map((tran) => dataToBytes(tran, null)),
|
|
403
|
+
transactions: SerializedList.fromArray(data.transactions.map((tran) => dataToBytes(tran, null))),
|
|
404
404
|
};
|
|
405
405
|
|
|
406
406
|
if (ForkSeq[fork] >= ForkSeq.capella) {
|
|
@@ -474,11 +474,11 @@ export function serializeBeaconBlockRoot(data: Root): DATA {
|
|
|
474
474
|
}
|
|
475
475
|
|
|
476
476
|
export function serializeInclusionList(data: bellatrix.Transactions): InclusionListRpc {
|
|
477
|
-
return
|
|
477
|
+
return Array.from(data, (transaction) => bytesToData(transaction));
|
|
478
478
|
}
|
|
479
479
|
|
|
480
480
|
export function deserializeInclusionList(data: InclusionListRpc): bellatrix.Transactions {
|
|
481
|
-
return data.map((transaction) => dataToBytes(transaction, null));
|
|
481
|
+
return SerializedList.fromArray(data.map((transaction) => dataToBytes(transaction, null)));
|
|
482
482
|
}
|
|
483
483
|
|
|
484
484
|
export function deserializePayloadAttributes(data: PayloadAttributesRpc): PayloadAttributes {
|
|
@@ -670,7 +670,7 @@ export function deserializeExecutionRequests(fork: ForkName, serialized: Executi
|
|
|
670
670
|
export function deserializeExecutionPayloadBody(data: ExecutionPayloadBodyRpc | null): ExecutionPayloadBody | null {
|
|
671
671
|
return data
|
|
672
672
|
? {
|
|
673
|
-
transactions: data.transactions.map((tran) => dataToBytes(tran, null)),
|
|
673
|
+
transactions: SerializedList.fromArray(data.transactions.map((tran) => dataToBytes(tran, null))),
|
|
674
674
|
withdrawals: data.withdrawals ? data.withdrawals.map(deserializeWithdrawal) : null,
|
|
675
675
|
}
|
|
676
676
|
: null;
|
|
@@ -693,7 +693,7 @@ export function serializeExecutionPayloadBodyV2(data: ExecutionPayloadBodyV2 | n
|
|
|
693
693
|
export function serializeExecutionPayloadBody(data: ExecutionPayloadBody | null): ExecutionPayloadBodyRpc | null {
|
|
694
694
|
return data
|
|
695
695
|
? {
|
|
696
|
-
transactions: data.transactions
|
|
696
|
+
transactions: Array.from(data.transactions, (tran) => bytesToData(tran)),
|
|
697
697
|
withdrawals: data.withdrawals ? data.withdrawals.map(serializeWithdrawal) : null,
|
|
698
698
|
}
|
|
699
699
|
: null;
|
|
@@ -1474,6 +1474,11 @@ export function createLodestarMetrics(
|
|
|
1474
1474
|
help: "Total number of InsertOutcome as a result of adding an execution payload bid from gossip to the pool",
|
|
1475
1475
|
labelNames: ["insertOutcome"],
|
|
1476
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
|
+
}),
|
|
1477
1482
|
apiValidationTime: register.histogram({
|
|
1478
1483
|
name: "lodestar_api_execution_payload_bid_validation_time_seconds",
|
|
1479
1484
|
help: "Time elapsed for signed execution payload bid validation - api path",
|