@lodestar/beacon-node 1.48.0 → 1.49.0-dev.2e84801d69
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/chain/errors/blockError.d.ts +0 -7
- package/lib/chain/errors/blockError.d.ts.map +1 -1
- package/lib/chain/errors/blockError.js +0 -2
- package/lib/chain/errors/blockError.js.map +1 -1
- package/lib/chain/prepareNextSlot.d.ts.map +1 -1
- package/lib/chain/prepareNextSlot.js +3 -1
- package/lib/chain/prepareNextSlot.js.map +1 -1
- package/lib/chain/produceBlock/produceBlockBody.d.ts +4 -2
- package/lib/chain/produceBlock/produceBlockBody.d.ts.map +1 -1
- package/lib/chain/produceBlock/produceBlockBody.js +11 -8
- package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
- package/lib/chain/validation/block.d.ts.map +1 -1
- package/lib/chain/validation/block.js +0 -9
- package/lib/chain/validation/block.js.map +1 -1
- package/lib/network/libp2p/index.d.ts +9 -1
- package/lib/network/libp2p/index.d.ts.map +1 -1
- package/lib/network/libp2p/index.js +23 -0
- package/lib/network/libp2p/index.js.map +1 -1
- package/package.json +16 -16
- package/src/chain/errors/blockError.ts +0 -3
- package/src/chain/prepareNextSlot.ts +5 -1
- package/src/chain/produceBlock/produceBlockBody.ts +12 -8
- package/src/chain/validation/block.ts +0 -10
- package/src/network/libp2p/index.ts +28 -1
|
@@ -75,8 +75,6 @@ export declare enum BlockErrorCode {
|
|
|
75
75
|
TOO_MANY_KZG_COMMITMENTS = "BLOCK_ERROR_TOO_MANY_KZG_COMMITMENTS",
|
|
76
76
|
/** Bid parent block root does not match block parent root */
|
|
77
77
|
BID_PARENT_ROOT_MISMATCH = "BLOCK_ERROR_BID_PARENT_ROOT_MISMATCH",
|
|
78
|
-
/** A block contains deposits where none are allowed */
|
|
79
|
-
NON_ZERO_DEPOSITS = "BLOCK_ERROR_NON_ZERO_DEPOSITS",
|
|
80
78
|
/** The parent block's execution payload has been verified as invalid */
|
|
81
79
|
PARENT_EXECUTION_INVALID = "BLOCK_ERROR_PARENT_EXECUTION_INVALID",
|
|
82
80
|
/**
|
|
@@ -217,11 +215,6 @@ export type BlockErrorType = {
|
|
|
217
215
|
root: RootHex;
|
|
218
216
|
bidParentRoot: RootHex;
|
|
219
217
|
blockParentRoot: RootHex;
|
|
220
|
-
} | {
|
|
221
|
-
code: BlockErrorCode.NON_ZERO_DEPOSITS;
|
|
222
|
-
slot: Slot;
|
|
223
|
-
root: RootHex;
|
|
224
|
-
count: number;
|
|
225
218
|
} | {
|
|
226
219
|
code: BlockErrorCode.PARENT_EXECUTION_INVALID;
|
|
227
220
|
parentRoot: RootHex;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blockError.d.ts","sourceRoot":"","sources":["../../../src/chain/errors/blockError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAC,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,cAAc,EAAC,MAAM,iBAAiB,CAAC;AACjF,OAAO,EAAC,aAAa,EAAY,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAC,sBAAsB,EAAC,MAAM,qCAAqC,CAAC;AAE3E,OAAO,EAAC,iBAAiB,EAAC,MAAM,uBAAuB,CAAC;AAExD,oBAAY,cAAc;IACxB,qCAAqC;IACrC,gBAAgB,iCAAiC;IACjD;;OAEG;IACH,oBAAoB,qCAAqC;IACzD,uDAAuD;IACvD,WAAW,4BAA4B;IACvC,+DAA+D;IAC/D,mBAAmB,oCAAoC;IACvD,yEAAyE;IACzE,aAAa,8BAA8B;IAC3C,gDAAgD;IAChD,2BAA2B,4CAA4C;IACvE,oDAAoD;IACpD,aAAa,8BAA8B;IAC3C,oEAAoE;IACpE,eAAe,gCAAgC;IAC/C,4DAA4D;IAC5D,wBAAwB,yCAAyC;IACjE,kGAAkG;IAClG,kBAAkB,mCAAmC;IACrD,yCAAyC;IACzC,0BAA0B,2CAA2C;IACrE,+CAA+C;IAC/C,gBAAgB,iCAAiC;IACjD,sEAAsE;IACtE,iBAAiB,kCAAkC;IACnD,mDAAmD;IACnD,kBAAkB,mCAAmC;IACrD,wEAAwE;IACxE,wBAAwB,yCAAyC;IACjE,gEAAgE;IAChE,qBAAqB,sCAAsC;IAC3D;;;OAGG;IACH,uBAAuB,wCAAwC;IAC/D,iFAAiF;IACjF,gBAAgB,iCAAiC;IACjD,2FAA2F;IAC3F,0BAA0B,2CAA2C;IACrE,qFAAqF;IACrF,kBAAkB,mCAAmC;IACrD,6DAA6D;IAC7D,eAAe,gCAAgC;IAC/C,yDAAyD;IACzD,iBAAiB,kCAAkC;IAEnD,2DAA2D;IAC3D,mBAAmB,oCAAoC;IACvD,2DAA2D;IAC3D,iBAAiB,kCAAkC;IACnD,gEAAgE;IAChE,gBAAgB,iCAAiC;IACjD,6FAA6F;IAC7F,oBAAoB,qCAAqC;IACzD,+GAA+G;IAC/G,sBAAsB,gCAAgC;IACtD;;;;OAIG;IACH,wBAAwB,kCAAkC;IAC1D,gCAAgC;IAChC,gBAAgB,iCAAiC;IACjD,8CAA8C;IAC9C,wBAAwB,yCAAyC;IACjE,6DAA6D;IAC7D,wBAAwB,yCAAyC;IACjE,
|
|
1
|
+
{"version":3,"file":"blockError.d.ts","sourceRoot":"","sources":["../../../src/chain/errors/blockError.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,8 +75,6 @@ export var BlockErrorCode;
|
|
|
75
75
|
BlockErrorCode["TOO_MANY_KZG_COMMITMENTS"] = "BLOCK_ERROR_TOO_MANY_KZG_COMMITMENTS";
|
|
76
76
|
/** Bid parent block root does not match block parent root */
|
|
77
77
|
BlockErrorCode["BID_PARENT_ROOT_MISMATCH"] = "BLOCK_ERROR_BID_PARENT_ROOT_MISMATCH";
|
|
78
|
-
/** A block contains deposits where none are allowed */
|
|
79
|
-
BlockErrorCode["NON_ZERO_DEPOSITS"] = "BLOCK_ERROR_NON_ZERO_DEPOSITS";
|
|
80
78
|
/** The parent block's execution payload has been verified as invalid */
|
|
81
79
|
BlockErrorCode["PARENT_EXECUTION_INVALID"] = "BLOCK_ERROR_PARENT_EXECUTION_INVALID";
|
|
82
80
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blockError.js","sourceRoot":"","sources":["../../../src/chain/errors/blockError.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,aAAa,EAAE,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAEzD,OAAO,EAAC,cAAc,EAAC,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAC,iBAAiB,EAAC,MAAM,uBAAuB,CAAC;AAExD,MAAM,CAAN,IAAY,
|
|
1
|
+
{"version":3,"file":"blockError.js","sourceRoot":"","sources":["../../../src/chain/errors/blockError.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareNextSlot.d.ts","sourceRoot":"","sources":["../../src/chain/prepareNextSlot.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAUjD,OAAO,EAEL,gBAAgB,EASjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAU,IAAI,EAAiB,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAC,MAAM,EAAiC,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"prepareNextSlot.d.ts","sourceRoot":"","sources":["../../src/chain/prepareNextSlot.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAUjD,OAAO,EAEL,gBAAgB,EASjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAU,IAAI,EAAiB,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAC,MAAM,EAAiC,MAAM,iBAAiB,CAAC;AAIvE,OAAO,EAAC,OAAO,EAAC,MAAM,qBAAqB,CAAC;AAI5C,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAM5C,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAkB1C;;;;;;;;;;GAUG;AACH,qBAAa,wBAAwB;IAEjC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IALzB,YACmB,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,OAAO,GAAG,IAAI,EACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,WAAW,EAUrC;IAED;;OAEG;IACH,kBAAkB,cAAqB,IAAI,KAAG,OAAO,CAAC,IAAI,CAAC,CA2TzD;IAEF;;;OAGG;IACH,OAAO,CAAC,4BAA4B;IAYpC,wBAAwB,CAAC,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,OAAO,GAAG,IAAI,CAQlF;CACF"}
|
|
@@ -191,6 +191,7 @@ export class PrepareNextSlotScheduler {
|
|
|
191
191
|
else {
|
|
192
192
|
parentBlockHash = preparedState.latestExecutionPayloadHeader.blockHash;
|
|
193
193
|
}
|
|
194
|
+
let payloadAttributes;
|
|
194
195
|
// If emitPayloadAttributes is true emit a SSE payloadAttributes event for
|
|
195
196
|
// every slot. Without the flag, only emit the event if we are proposing in the next slot.
|
|
196
197
|
if ((feeRecipient || this.chain.opts.emitPayloadAttributes === true) &&
|
|
@@ -203,6 +204,7 @@ export class PrepareNextSlotScheduler {
|
|
|
203
204
|
feeRecipient: feeRecipient ?? "0x0000000000000000000000000000000000000000",
|
|
204
205
|
});
|
|
205
206
|
this.chain.emitter.emit(routes.events.EventType.payloadAttributes, { data, version: fork });
|
|
207
|
+
payloadAttributes = data.payloadAttributes;
|
|
206
208
|
}
|
|
207
209
|
if (feeRecipient) {
|
|
208
210
|
const preparationTime = computeTimeAtSlot(this.config, prepareSlot, this.chain.genesisTime) - Date.now() / 1000;
|
|
@@ -213,7 +215,7 @@ export class PrepareNextSlotScheduler {
|
|
|
213
215
|
// left for scheduler and this gives nice semantics to catch and log errors in the
|
|
214
216
|
// try/catch wrapper here.
|
|
215
217
|
await prepareExecutionPayload(this.chain, this.logger, fork, // State is of execution type
|
|
216
|
-
fromHex(updatedHead.blockRoot), parentBlockHash, safeBlockHash, finalizedBlockHash, stateAfterParentPayload, feeRecipient);
|
|
218
|
+
fromHex(updatedHead.blockRoot), parentBlockHash, safeBlockHash, finalizedBlockHash, stateAfterParentPayload, feeRecipient, payloadAttributes);
|
|
217
219
|
this.logger.verbose("PrepareNextSlotScheduler prepared new payload", {
|
|
218
220
|
prepareSlot,
|
|
219
221
|
proposerIndex,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareNextSlot.js","sourceRoot":"","sources":["../../src/chain/prepareNextSlot.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"prepareNextSlot.js","sourceRoot":"","sources":["../../src/chain/prepareNextSlot.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { ForkName, ForkPostBellatrix, ForkPostDeneb, ForkPostFulu, ForkPostGloas
|
|
|
4
4
|
import { IBeaconStateView, type IBeaconStateViewBellatrix } from "@lodestar/state-transition";
|
|
5
5
|
import { BLSPubkey, BLSSignature, BeaconBlock, BeaconBlockBody, BlindedBeaconBlock, BlindedBeaconBlockBody, BlobsBundle, Bytes32, ExecutionPayload, Root, RootHex, SSEPayloadAttributes, Slot, ValidatorIndex, Wei, fulu, gloas } from "@lodestar/types";
|
|
6
6
|
import { Logger } from "@lodestar/utils";
|
|
7
|
-
import { IExecutionEngine, PayloadId } from "../../execution/index.js";
|
|
7
|
+
import { IExecutionEngine, PayloadAttributes, PayloadId } from "../../execution/index.js";
|
|
8
8
|
import type { BeaconChain } from "../chain.js";
|
|
9
9
|
import { CommonBlockBody } from "../interface.js";
|
|
10
10
|
import { ProposerPreferencesPool } from "../opPools/index.js";
|
|
@@ -103,7 +103,9 @@ export declare function prepareExecutionPayload(chain: {
|
|
|
103
103
|
* Post-gloas, when extending a full parent, callers must apply
|
|
104
104
|
* parent execution payload first (see `withParentPayloadApplied`).
|
|
105
105
|
*/
|
|
106
|
-
state: IBeaconStateViewBellatrix, suggestedFeeRecipient: string
|
|
106
|
+
state: IBeaconStateViewBellatrix, suggestedFeeRecipient: string,
|
|
107
|
+
/** Attributes already computed for the same state and fee recipient, e.g. for the SSE event */
|
|
108
|
+
payloadAttributes?: PayloadAttributes): Promise<{
|
|
107
109
|
prepType: PayloadPreparationType;
|
|
108
110
|
payloadId: PayloadId;
|
|
109
111
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"produceBlockBody.d.ts","sourceRoot":"","sources":["../../../src/chain/produceBlock/produceBlockBody.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,WAAW,EACX,UAAU,EAGX,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAEL,QAAQ,EACR,iBAAiB,EAEjB,aAAa,EACb,YAAY,EACZ,aAAa,EAOd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAEL,gBAAgB,EAChB,KAAK,yBAAyB,EAO/B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,SAAS,EACT,YAAY,EACZ,WAAW,EACX,eAAe,EACf,kBAAkB,EAClB,sBAAsB,EACtB,WAAW,EACX,OAAO,EACP,gBAAgB,EAEhB,IAAI,EACJ,OAAO,EACP,oBAAoB,EACpB,IAAI,EACJ,cAAc,EACd,GAAG,EAMH,IAAI,EACJ,KAAK,EAGN,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAc,MAAM,EAAiE,MAAM,iBAAiB,CAAC;AAGpH,OAAO,EAAoB,gBAAgB,
|
|
1
|
+
{"version":3,"file":"produceBlockBody.d.ts","sourceRoot":"","sources":["../../../src/chain/produceBlock/produceBlockBody.ts"],"names":[],"mappings":"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"}
|
|
@@ -458,7 +458,9 @@ export async function prepareExecutionPayload(chain, logger, fork, parentBlockRo
|
|
|
458
458
|
* Post-gloas, when extending a full parent, callers must apply
|
|
459
459
|
* parent execution payload first (see `withParentPayloadApplied`).
|
|
460
460
|
*/
|
|
461
|
-
state, suggestedFeeRecipient
|
|
461
|
+
state, suggestedFeeRecipient,
|
|
462
|
+
/** Attributes already computed for the same state and fee recipient, e.g. for the SSE event */
|
|
463
|
+
payloadAttributes) {
|
|
462
464
|
const timestamp = computeTimeAtSlot(chain.config, state.slot, state.genesisTime);
|
|
463
465
|
const prevRandao = state.getRandaoMix(state.epoch);
|
|
464
466
|
const payloadIdCached = chain.executionEngine.payloadIdCache.get({
|
|
@@ -486,13 +488,14 @@ state, suggestedFeeRecipient) {
|
|
|
486
488
|
else {
|
|
487
489
|
prepType = PayloadPreparationType.Fresh;
|
|
488
490
|
}
|
|
489
|
-
const attributes =
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
491
|
+
const attributes = payloadAttributes ??
|
|
492
|
+
preparePayloadAttributes(fork, chain, {
|
|
493
|
+
prepareState: state,
|
|
494
|
+
prepareSlot: state.slot,
|
|
495
|
+
parentBlockRoot,
|
|
496
|
+
parentBlockHash,
|
|
497
|
+
feeRecipient: suggestedFeeRecipient,
|
|
498
|
+
});
|
|
496
499
|
payloadId = await chain.executionEngine.notifyForkchoiceUpdate(fork, toRootHex(parentBlockHash), safeBlockHash, finalizedBlockHash, attributes);
|
|
497
500
|
logger.verbose("Prepared payload id from execution engine", { payloadId });
|
|
498
501
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"produceBlockBody.js","sourceRoot":"","sources":["../../../src/chain/produceBlock/produceBlockBody.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"produceBlockBody.js","sourceRoot":"","sources":["../../../src/chain/produceBlock/produceBlockBody.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../../src/chain/validation/block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAC,QAAQ,EAA4E,MAAM,kBAAkB,CAAC;AAUrH,OAAO,EAAC,OAAO,EAAE,iBAAiB,EAAwC,MAAM,iBAAiB,CAAC;AAGlG,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAG7C,MAAM,MAAM,2BAA2B,GAAG;IACxC,4FAA4F;IAC5F,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,eAAe,EACvB,KAAK,EAAE,YAAY,EACnB,WAAW,EAAE,iBAAiB,EAC9B,IAAI,EAAE,QAAQ,GACb,OAAO,CAAC,2BAA2B,CAAC,
|
|
1
|
+
{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../../src/chain/validation/block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAC,QAAQ,EAA4E,MAAM,kBAAkB,CAAC;AAUrH,OAAO,EAAC,OAAO,EAAE,iBAAiB,EAAwC,MAAM,iBAAiB,CAAC;AAGlG,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAG7C,MAAM,MAAM,2BAA2B,GAAG;IACxC,4FAA4F;IAC5F,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,eAAe,EACvB,KAAK,EAAE,YAAY,EACnB,WAAW,EAAE,iBAAiB,EAC9B,IAAI,EAAE,QAAQ,GACb,OAAO,CAAC,2BAA2B,CAAC,CA0RtC;AAED,wBAAsB,4BAA4B,CAChD,KAAK,EAAE,YAAY,EACnB,WAAW,EAAE,iBAAiB,EAC9B,SAAS,EAAE,OAAO,EAClB,IAAI,GAAE;IAAC,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAAM,GACxC,OAAO,CAAC,IAAI,CAAC,CAiBf"}
|
|
@@ -152,15 +152,6 @@ export async function validateGossipBlock(config, chain, signedBlock, fork) {
|
|
|
152
152
|
blockParentRoot: parentRoot,
|
|
153
153
|
});
|
|
154
154
|
}
|
|
155
|
-
// [REJECT] The block contains no deposits.
|
|
156
|
-
if (body.deposits.length !== 0) {
|
|
157
|
-
throw new BlockGossipError(GossipAction.REJECT, {
|
|
158
|
-
code: BlockErrorCode.NON_ZERO_DEPOSITS,
|
|
159
|
-
slot: blockSlot,
|
|
160
|
-
root: blockRoot,
|
|
161
|
-
count: body.deposits.length,
|
|
162
|
-
});
|
|
163
|
-
}
|
|
164
155
|
// TODO GLOAS: [REJECT] The block's execution payload parent (defined by bid.parent_block_hash) passes all validation
|
|
165
156
|
// This requires execution engine integration to verify the parent block hash
|
|
166
157
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block.js","sourceRoot":"","sources":["../../../src/chain/validation/block.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"block.js","sourceRoot":"","sources":["../../../src/chain/validation/block.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,15 @@
|
|
|
1
|
-
import type { PrivateKey } from "@libp2p/interface";
|
|
1
|
+
import type { Address, PrivateKey } from "@libp2p/interface";
|
|
2
2
|
import { Registry } from "prom-client";
|
|
3
3
|
import { Libp2p } from "../interface.js";
|
|
4
4
|
import { NetworkOptions } from "../options.js";
|
|
5
|
+
/**
|
|
6
|
+
* Custom sorter for libp2p's `addressSorter`.
|
|
7
|
+
*
|
|
8
|
+
* Prefers QUIC > TCP addresses before dialing, per p2p spec.
|
|
9
|
+
*
|
|
10
|
+
* Spec: https://github.com/ethereum/consensus-specs/blob/f21dac06e99743b1e98bb80297897b96520c942b/specs/phase0/p2p-interface.md#transport
|
|
11
|
+
*/
|
|
12
|
+
export declare function quicFirstAddressSorter(a: Address, b: Address): -1 | 0 | 1;
|
|
5
13
|
export type NodeJsLibp2pOpts = {
|
|
6
14
|
peerStoreDir?: string;
|
|
7
15
|
disablePeerDiscovery?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/network/libp2p/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/network/libp2p/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,OAAO,EAAE,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAQ3D,OAAO,EAAC,QAAQ,EAAC,MAAM,aAAa,CAAC;AAKrC,OAAO,EAAC,MAAM,EAAqB,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAC,cAAc,EAAwB,MAAM,eAAe,CAAC;AAkBpE;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAOzE;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,QAAQ,CAAC;CAC5B,CAAC;AAEF,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAatG;AAED,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,UAAU,EACtB,WAAW,GAAE,OAAO,CAAC,cAAc,CAAM,EACzC,gBAAgB,GAAE,gBAAqB,GACtC,OAAO,CAAC,MAAM,CAAC,CA6IjB"}
|
|
@@ -5,6 +5,7 @@ import { mdns } from "@libp2p/mdns";
|
|
|
5
5
|
import { mplex } from "@libp2p/mplex";
|
|
6
6
|
import { prometheusMetrics } from "@libp2p/prometheus-metrics";
|
|
7
7
|
import { tcp } from "@libp2p/tcp";
|
|
8
|
+
import { loopbackAddressLast, publicAddressesFirst, reliableTransportsFirst } from "@libp2p/utils";
|
|
8
9
|
import { createLibp2p } from "libp2p";
|
|
9
10
|
import { ENR } from "@chainsafe/enr";
|
|
10
11
|
import { noise } from "@chainsafe/libp2p-noise";
|
|
@@ -19,6 +20,26 @@ const noiseCrypto = getCiphers().includes("chacha20-poly1305")
|
|
|
19
20
|
chaCha20Poly1305Encrypt: asCrypto.chaCha20Poly1305Encrypt,
|
|
20
21
|
chaCha20Poly1305Decrypt: asCrypto.chaCha20Poly1305Decrypt,
|
|
21
22
|
};
|
|
23
|
+
function quicAddressesFirst(a, b) {
|
|
24
|
+
const aQuic = a.getComponents().some((c) => c.name === "quic-v1");
|
|
25
|
+
const bQuic = b.getComponents().some((c) => c.name === "quic-v1");
|
|
26
|
+
if (aQuic === bQuic)
|
|
27
|
+
return 0;
|
|
28
|
+
return aQuic ? -1 : 1;
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* Custom sorter for libp2p's `addressSorter`.
|
|
32
|
+
*
|
|
33
|
+
* Prefers QUIC > TCP addresses before dialing, per p2p spec.
|
|
34
|
+
*
|
|
35
|
+
* Spec: https://github.com/ethereum/consensus-specs/blob/f21dac06e99743b1e98bb80297897b96520c942b/specs/phase0/p2p-interface.md#transport
|
|
36
|
+
*/
|
|
37
|
+
export function quicFirstAddressSorter(a, b) {
|
|
38
|
+
return (loopbackAddressLast(a.multiaddr, b.multiaddr) ||
|
|
39
|
+
publicAddressesFirst(a.multiaddr, b.multiaddr) ||
|
|
40
|
+
quicAddressesFirst(a.multiaddr, b.multiaddr) ||
|
|
41
|
+
reliableTransportsFirst(a.multiaddr, b.multiaddr));
|
|
42
|
+
}
|
|
22
43
|
export async function getDiscv5Multiaddrs(bootEnrs, quicEnabled) {
|
|
23
44
|
const bootMultiaddrs = [];
|
|
24
45
|
for (const enrStr of bootEnrs) {
|
|
@@ -124,6 +145,8 @@ export async function createNodeJsLibp2p(privateKey, networkOpts = {}, nodeJsLib
|
|
|
124
145
|
// the maximum number of pending connections libp2p will accept before it starts rejecting incoming connections.
|
|
125
146
|
// make it the same to backlog option above
|
|
126
147
|
maxIncomingPendingConnections: 5,
|
|
148
|
+
// Prefer dialing QUIC > TCP for a peer address if QUIC is enabled
|
|
149
|
+
addressSorter: quicEnabled ? quicFirstAddressSorter : undefined,
|
|
127
150
|
},
|
|
128
151
|
// rely on lodestar's peer manager to ping peers
|
|
129
152
|
connectionMonitor: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/network/libp2p/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,aAAa,CAAC;AACvC,OAAO,EAAC,SAAS,EAAC,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAC,IAAI,EAAC,MAAM,cAAc,CAAC;AAClC,OAAO,EAAC,KAAK,EAAC,MAAM,eAAe,CAAC;AACpC,OAAO,EAAC,iBAAiB,EAAC,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAC,GAAG,EAAC,MAAM,aAAa,CAAC;AAChC,OAAO,EAAa,YAAY,EAAC,MAAM,QAAQ,CAAC;AAEhD,OAAO,EAAC,GAAG,EAAC,MAAM,gBAAgB,CAAC;AACnC,OAAO,EAAC,KAAK,EAAC,MAAM,yBAAyB,CAAC;AAC9C,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAC,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAC,IAAI,EAAC,MAAM,wBAAwB,CAAC;AAE5C,OAAO,EAAiB,qBAAqB,EAAC,MAAM,eAAe,CAAC;AACpE,OAAO,EAAC,iBAAiB,EAAC,MAAM,uBAAuB,CAAC;AAExD,MAAM,WAAW,GAAG,UAAU,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC;IAC5D,CAAC,CAAC,aAAa;IACf,CAAC,CAAC;QACE,GAAG,aAAa;QAChB,uBAAuB,EAAE,QAAQ,CAAC,uBAAuB;QACzD,uBAAuB,EAAE,QAAQ,CAAC,uBAAuB;KAC1D,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/network/libp2p/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"bugs": {
|
|
12
12
|
"url": "https://github.com/ChainSafe/lodestar/issues"
|
|
13
13
|
},
|
|
14
|
-
"version": "1.
|
|
14
|
+
"version": "1.49.0-dev.2e84801d69",
|
|
15
15
|
"type": "module",
|
|
16
16
|
"exports": {
|
|
17
17
|
".": {
|
|
@@ -109,7 +109,7 @@
|
|
|
109
109
|
"@chainsafe/persistent-merkle-tree": "^1.3.1",
|
|
110
110
|
"@chainsafe/prometheus-gc-stats": "^1.0.0",
|
|
111
111
|
"@chainsafe/snappy-wasm": "^0.5.2",
|
|
112
|
-
"@chainsafe/ssz": "^1.
|
|
112
|
+
"@chainsafe/ssz": "^1.8.0",
|
|
113
113
|
"@chainsafe/threads": "^1.11.3",
|
|
114
114
|
"@crate-crypto/node-eth-kzg": "0.9.1",
|
|
115
115
|
"@fastify/bearer-auth": "^10.0.1",
|
|
@@ -126,17 +126,18 @@
|
|
|
126
126
|
"@libp2p/peer-id": "^6.0.15",
|
|
127
127
|
"@libp2p/prometheus-metrics": "^5.0.28",
|
|
128
128
|
"@libp2p/tcp": "^11.0.27",
|
|
129
|
-
"@
|
|
130
|
-
"@lodestar/
|
|
131
|
-
"@lodestar/
|
|
132
|
-
"@lodestar/
|
|
133
|
-
"@lodestar/
|
|
134
|
-
"@lodestar/
|
|
135
|
-
"@lodestar/
|
|
136
|
-
"@lodestar/
|
|
137
|
-
"@lodestar/
|
|
138
|
-
"@lodestar/
|
|
139
|
-
"@lodestar/
|
|
129
|
+
"@libp2p/utils": "^7.4.0",
|
|
130
|
+
"@lodestar/api": "^1.49.0-dev.2e84801d69",
|
|
131
|
+
"@lodestar/config": "^1.49.0-dev.2e84801d69",
|
|
132
|
+
"@lodestar/db": "^1.49.0-dev.2e84801d69",
|
|
133
|
+
"@lodestar/fork-choice": "^1.49.0-dev.2e84801d69",
|
|
134
|
+
"@lodestar/logger": "^1.49.0-dev.2e84801d69",
|
|
135
|
+
"@lodestar/params": "^1.49.0-dev.2e84801d69",
|
|
136
|
+
"@lodestar/reqresp": "^1.49.0-dev.2e84801d69",
|
|
137
|
+
"@lodestar/state-transition": "^1.49.0-dev.2e84801d69",
|
|
138
|
+
"@lodestar/types": "^1.49.0-dev.2e84801d69",
|
|
139
|
+
"@lodestar/utils": "^1.49.0-dev.2e84801d69",
|
|
140
|
+
"@lodestar/validator": "^1.49.0-dev.2e84801d69",
|
|
140
141
|
"@multiformats/multiaddr": "^13.0.1",
|
|
141
142
|
"datastore-core": "^12.0.1",
|
|
142
143
|
"datastore-level": "^13.0.1",
|
|
@@ -158,8 +159,7 @@
|
|
|
158
159
|
"@chainsafe/swap-or-not-shuffle": "^1.2.1",
|
|
159
160
|
"@libp2p/interface-internal": "^3.1.12",
|
|
160
161
|
"@libp2p/logger": "^6.2.13",
|
|
161
|
-
"@
|
|
162
|
-
"@lodestar/spec-test-util": "^1.48.0",
|
|
162
|
+
"@lodestar/spec-test-util": "^1.49.0-dev.2e84801d69",
|
|
163
163
|
"@types/js-yaml": "^4.0.5",
|
|
164
164
|
"@types/qs": "^6.9.7",
|
|
165
165
|
"@types/tmp": "^0.2.3",
|
|
@@ -174,5 +174,5 @@
|
|
|
174
174
|
"beacon",
|
|
175
175
|
"blockchain"
|
|
176
176
|
],
|
|
177
|
-
"gitHead": "
|
|
177
|
+
"gitHead": "b7f552d6a71d544d119b36ea72918b08c8a945db"
|
|
178
178
|
}
|
|
@@ -78,8 +78,6 @@ export enum BlockErrorCode {
|
|
|
78
78
|
TOO_MANY_KZG_COMMITMENTS = "BLOCK_ERROR_TOO_MANY_KZG_COMMITMENTS",
|
|
79
79
|
/** Bid parent block root does not match block parent root */
|
|
80
80
|
BID_PARENT_ROOT_MISMATCH = "BLOCK_ERROR_BID_PARENT_ROOT_MISMATCH",
|
|
81
|
-
/** A block contains deposits where none are allowed */
|
|
82
|
-
NON_ZERO_DEPOSITS = "BLOCK_ERROR_NON_ZERO_DEPOSITS",
|
|
83
81
|
/** The parent block's execution payload has been verified as invalid */
|
|
84
82
|
PARENT_EXECUTION_INVALID = "BLOCK_ERROR_PARENT_EXECUTION_INVALID",
|
|
85
83
|
/**
|
|
@@ -165,7 +163,6 @@ export type BlockErrorType =
|
|
|
165
163
|
bidParentRoot: RootHex;
|
|
166
164
|
blockParentRoot: RootHex;
|
|
167
165
|
}
|
|
168
|
-
| {code: BlockErrorCode.NON_ZERO_DEPOSITS; slot: Slot; root: RootHex; count: number}
|
|
169
166
|
| {code: BlockErrorCode.PARENT_EXECUTION_INVALID; parentRoot: RootHex}
|
|
170
167
|
| {code: BlockErrorCode.PARENT_PAYLOAD_UNKNOWN; parentRoot: RootHex; parentBlockHash: RootHex}
|
|
171
168
|
| {code: BlockErrorCode.NON_LINEAR_PAYLOAD_ROOTS; parentBlockHash: RootHex; expectedBlockHash: RootHex};
|
|
@@ -25,6 +25,7 @@ import {Bytes32, Slot, ValidatorIndex} from "@lodestar/types";
|
|
|
25
25
|
import {Logger, fromHex, isErrorAborted, sleep} from "@lodestar/utils";
|
|
26
26
|
import {GENESIS_SLOT} from "../constants/constants.js";
|
|
27
27
|
import {BuilderStatus} from "../execution/builder/http.js";
|
|
28
|
+
import {PayloadAttributes} from "../execution/index.js";
|
|
28
29
|
import {Metrics} from "../metrics/index.js";
|
|
29
30
|
import {ClockEvent} from "../util/clock.js";
|
|
30
31
|
import {isQueueErrorAborted} from "../util/queue/index.js";
|
|
@@ -243,6 +244,7 @@ export class PrepareNextSlotScheduler {
|
|
|
243
244
|
parentBlockHash = preparedState.latestExecutionPayloadHeader.blockHash;
|
|
244
245
|
}
|
|
245
246
|
|
|
247
|
+
let payloadAttributes: PayloadAttributes | undefined;
|
|
246
248
|
// If emitPayloadAttributes is true emit a SSE payloadAttributes event for
|
|
247
249
|
// every slot. Without the flag, only emit the event if we are proposing in the next slot.
|
|
248
250
|
if (
|
|
@@ -257,6 +259,7 @@ export class PrepareNextSlotScheduler {
|
|
|
257
259
|
feeRecipient: feeRecipient ?? "0x0000000000000000000000000000000000000000",
|
|
258
260
|
});
|
|
259
261
|
this.chain.emitter.emit(routes.events.EventType.payloadAttributes, {data, version: fork});
|
|
262
|
+
payloadAttributes = data.payloadAttributes;
|
|
260
263
|
}
|
|
261
264
|
|
|
262
265
|
if (feeRecipient) {
|
|
@@ -279,7 +282,8 @@ export class PrepareNextSlotScheduler {
|
|
|
279
282
|
safeBlockHash,
|
|
280
283
|
finalizedBlockHash,
|
|
281
284
|
stateAfterParentPayload,
|
|
282
|
-
feeRecipient
|
|
285
|
+
feeRecipient,
|
|
286
|
+
payloadAttributes
|
|
283
287
|
);
|
|
284
288
|
this.logger.verbose("PrepareNextSlotScheduler prepared new payload", {
|
|
285
289
|
prepareSlot,
|
|
@@ -735,7 +735,9 @@ export async function prepareExecutionPayload(
|
|
|
735
735
|
* parent execution payload first (see `withParentPayloadApplied`).
|
|
736
736
|
*/
|
|
737
737
|
state: IBeaconStateViewBellatrix,
|
|
738
|
-
suggestedFeeRecipient: string
|
|
738
|
+
suggestedFeeRecipient: string,
|
|
739
|
+
/** Attributes already computed for the same state and fee recipient, e.g. for the SSE event */
|
|
740
|
+
payloadAttributes?: PayloadAttributes
|
|
739
741
|
): Promise<{prepType: PayloadPreparationType; payloadId: PayloadId}> {
|
|
740
742
|
const timestamp = computeTimeAtSlot(chain.config, state.slot, state.genesisTime);
|
|
741
743
|
const prevRandao = state.getRandaoMix(state.epoch);
|
|
@@ -766,13 +768,15 @@ export async function prepareExecutionPayload(
|
|
|
766
768
|
prepType = PayloadPreparationType.Fresh;
|
|
767
769
|
}
|
|
768
770
|
|
|
769
|
-
const attributes: PayloadAttributes =
|
|
770
|
-
|
|
771
|
-
|
|
772
|
-
|
|
773
|
-
|
|
774
|
-
|
|
775
|
-
|
|
771
|
+
const attributes: PayloadAttributes =
|
|
772
|
+
payloadAttributes ??
|
|
773
|
+
preparePayloadAttributes(fork, chain, {
|
|
774
|
+
prepareState: state,
|
|
775
|
+
prepareSlot: state.slot,
|
|
776
|
+
parentBlockRoot,
|
|
777
|
+
parentBlockHash,
|
|
778
|
+
feeRecipient: suggestedFeeRecipient,
|
|
779
|
+
});
|
|
776
780
|
|
|
777
781
|
payloadId = await chain.executionEngine.notifyForkchoiceUpdate(
|
|
778
782
|
fork,
|
|
@@ -188,16 +188,6 @@ export async function validateGossipBlock(
|
|
|
188
188
|
});
|
|
189
189
|
}
|
|
190
190
|
|
|
191
|
-
// [REJECT] The block contains no deposits.
|
|
192
|
-
if (body.deposits.length !== 0) {
|
|
193
|
-
throw new BlockGossipError(GossipAction.REJECT, {
|
|
194
|
-
code: BlockErrorCode.NON_ZERO_DEPOSITS,
|
|
195
|
-
slot: blockSlot,
|
|
196
|
-
root: blockRoot,
|
|
197
|
-
count: body.deposits.length,
|
|
198
|
-
});
|
|
199
|
-
}
|
|
200
|
-
|
|
201
191
|
// TODO GLOAS: [REJECT] The block's execution payload parent (defined by bid.parent_block_hash) passes all validation
|
|
202
192
|
// This requires execution engine integration to verify the parent block hash
|
|
203
193
|
}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import {getCiphers} from "node:crypto";
|
|
2
2
|
import {bootstrap} from "@libp2p/bootstrap";
|
|
3
3
|
import {identify} from "@libp2p/identify";
|
|
4
|
-
import type {PrivateKey} from "@libp2p/interface";
|
|
4
|
+
import type {Address, PrivateKey} from "@libp2p/interface";
|
|
5
5
|
import {mdns} from "@libp2p/mdns";
|
|
6
6
|
import {mplex} from "@libp2p/mplex";
|
|
7
7
|
import {prometheusMetrics} from "@libp2p/prometheus-metrics";
|
|
8
8
|
import {tcp} from "@libp2p/tcp";
|
|
9
|
+
import {loopbackAddressLast, publicAddressesFirst, reliableTransportsFirst} from "@libp2p/utils";
|
|
10
|
+
import type {Multiaddr} from "@multiformats/multiaddr";
|
|
9
11
|
import {Libp2pInit, createLibp2p} from "libp2p";
|
|
10
12
|
import {Registry} from "prom-client";
|
|
11
13
|
import {ENR} from "@chainsafe/enr";
|
|
@@ -24,6 +26,29 @@ const noiseCrypto = getCiphers().includes("chacha20-poly1305")
|
|
|
24
26
|
chaCha20Poly1305Decrypt: asCrypto.chaCha20Poly1305Decrypt,
|
|
25
27
|
};
|
|
26
28
|
|
|
29
|
+
function quicAddressesFirst(a: Multiaddr, b: Multiaddr): -1 | 0 | 1 {
|
|
30
|
+
const aQuic = a.getComponents().some((c) => c.name === "quic-v1");
|
|
31
|
+
const bQuic = b.getComponents().some((c) => c.name === "quic-v1");
|
|
32
|
+
if (aQuic === bQuic) return 0;
|
|
33
|
+
return aQuic ? -1 : 1;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
/**
|
|
37
|
+
* Custom sorter for libp2p's `addressSorter`.
|
|
38
|
+
*
|
|
39
|
+
* Prefers QUIC > TCP addresses before dialing, per p2p spec.
|
|
40
|
+
*
|
|
41
|
+
* Spec: https://github.com/ethereum/consensus-specs/blob/f21dac06e99743b1e98bb80297897b96520c942b/specs/phase0/p2p-interface.md#transport
|
|
42
|
+
*/
|
|
43
|
+
export function quicFirstAddressSorter(a: Address, b: Address): -1 | 0 | 1 {
|
|
44
|
+
return (
|
|
45
|
+
loopbackAddressLast(a.multiaddr, b.multiaddr) ||
|
|
46
|
+
publicAddressesFirst(a.multiaddr, b.multiaddr) ||
|
|
47
|
+
quicAddressesFirst(a.multiaddr, b.multiaddr) ||
|
|
48
|
+
reliableTransportsFirst(a.multiaddr, b.multiaddr)
|
|
49
|
+
);
|
|
50
|
+
}
|
|
51
|
+
|
|
27
52
|
export type NodeJsLibp2pOpts = {
|
|
28
53
|
peerStoreDir?: string;
|
|
29
54
|
disablePeerDiscovery?: boolean;
|
|
@@ -150,6 +175,8 @@ export async function createNodeJsLibp2p(
|
|
|
150
175
|
// the maximum number of pending connections libp2p will accept before it starts rejecting incoming connections.
|
|
151
176
|
// make it the same to backlog option above
|
|
152
177
|
maxIncomingPendingConnections: 5,
|
|
178
|
+
// Prefer dialing QUIC > TCP for a peer address if QUIC is enabled
|
|
179
|
+
addressSorter: quicEnabled ? quicFirstAddressSorter : undefined,
|
|
153
180
|
},
|
|
154
181
|
// rely on lodestar's peer manager to ping peers
|
|
155
182
|
connectionMonitor: {
|