@lodestar/beacon-node 1.46.0-dev.8fc4e297d2 → 1.46.0-dev.9b97bb94f2
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/lodestar/index.d.ts.map +1 -1
- package/lib/api/impl/lodestar/index.js +2 -3
- package/lib/api/impl/lodestar/index.js.map +1 -1
- package/lib/chain/archiveStore/historicalState/historicalStateRegen.d.ts.map +1 -1
- package/lib/chain/archiveStore/historicalState/historicalStateRegen.js +0 -1
- package/lib/chain/archiveStore/historicalState/historicalStateRegen.js.map +1 -1
- package/lib/chain/bls/multithread/index.d.ts.map +1 -1
- package/lib/chain/bls/multithread/index.js +0 -1
- package/lib/chain/bls/multithread/index.js.map +1 -1
- package/lib/chain/chain.d.ts.map +1 -1
- package/lib/chain/chain.js +32 -11
- package/lib/chain/chain.js.map +1 -1
- package/lib/chain/validation/blobSidecar.js +1 -1
- package/lib/chain/validation/executionPayloadBid.d.ts +5 -0
- package/lib/chain/validation/executionPayloadBid.d.ts.map +1 -1
- package/lib/chain/validation/executionPayloadBid.js +29 -1
- package/lib/chain/validation/executionPayloadBid.js.map +1 -1
- package/lib/chain/validation/proposerPreferences.js +8 -8
- package/lib/chain/validation/proposerPreferences.js.map +1 -1
- package/lib/metrics/nodeJsMetrics.js +1 -1
- package/lib/metrics/nodeJsMetrics.js.map +1 -1
- package/lib/network/core/networkCoreWorkerHandler.d.ts.map +1 -1
- package/lib/network/core/networkCoreWorkerHandler.js +2 -7
- package/lib/network/core/networkCoreWorkerHandler.js.map +1 -1
- package/lib/network/discv5/index.d.ts.map +1 -1
- package/lib/network/discv5/index.js +1 -4
- package/lib/network/discv5/index.js.map +1 -1
- package/lib/network/libp2p/index.d.ts.map +1 -1
- package/lib/network/libp2p/index.js +2 -9
- package/lib/network/libp2p/index.js.map +1 -1
- package/lib/network/peers/datastore.d.ts +1 -1
- package/lib/network/peers/datastore.d.ts.map +1 -1
- package/lib/network/peers/datastore.js +1 -1
- package/lib/network/peers/datastore.js.map +1 -1
- package/lib/util/profile.d.ts +3 -0
- package/lib/util/profile.d.ts.map +1 -1
- package/lib/util/profile.js +1 -27
- package/lib/util/profile.js.map +1 -1
- package/package.json +25 -36
- package/src/api/impl/lodestar/index.ts +2 -3
- package/src/chain/archiveStore/historicalState/historicalStateRegen.ts +0 -1
- package/src/chain/bls/multithread/index.ts +0 -1
- package/src/chain/chain.ts +39 -9
- package/src/chain/validation/blobSidecar.ts +1 -1
- package/src/chain/validation/executionPayloadBid.ts +31 -1
- package/src/chain/validation/proposerPreferences.ts +8 -8
- package/src/metrics/nodeJsMetrics.ts +1 -1
- package/src/network/core/networkCoreWorkerHandler.ts +2 -6
- package/src/network/discv5/index.ts +1 -4
- package/src/network/libp2p/index.ts +2 -10
- package/src/network/peers/datastore.ts +1 -1
- package/src/util/profile.ts +1 -31
- package/lib/bun-wrappers/prometheus-gc-stats.d.ts +0 -2
- package/lib/bun-wrappers/prometheus-gc-stats.d.ts.map +0 -1
- package/lib/bun-wrappers/prometheus-gc-stats.js +0 -8
- package/lib/bun-wrappers/prometheus-gc-stats.js.map +0 -1
- package/lib/network/peers/datastore_bun.d.ts +0 -3
- package/lib/network/peers/datastore_bun.d.ts.map +0 -1
- package/lib/network/peers/datastore_bun.js +0 -3
- package/lib/network/peers/datastore_bun.js.map +0 -1
- package/src/bun-wrappers/prometheus-gc-stats.ts +0 -7
- package/src/network/peers/datastore_bun.ts +0 -3
package/package.json
CHANGED
|
@@ -11,75 +11,65 @@
|
|
|
11
11
|
"bugs": {
|
|
12
12
|
"url": "https://github.com/ChainSafe/lodestar/issues"
|
|
13
13
|
},
|
|
14
|
-
"version": "1.46.0-dev.
|
|
14
|
+
"version": "1.46.0-dev.9b97bb94f2",
|
|
15
15
|
"type": "module",
|
|
16
16
|
"exports": {
|
|
17
17
|
".": {
|
|
18
|
-
"
|
|
18
|
+
"typescript": "./src/index.ts",
|
|
19
19
|
"types": "./lib/index.d.ts",
|
|
20
20
|
"import": "./lib/index.js"
|
|
21
21
|
},
|
|
22
22
|
"./api": {
|
|
23
|
-
"
|
|
23
|
+
"typescript": "./src/api/index.ts",
|
|
24
24
|
"types": "./lib/api/index.d.ts",
|
|
25
25
|
"import": "./lib/api/index.js"
|
|
26
26
|
},
|
|
27
27
|
"./chain": {
|
|
28
|
-
"
|
|
28
|
+
"typescript": "./src/chain/index.ts",
|
|
29
29
|
"types": "./lib/chain/index.d.ts",
|
|
30
30
|
"import": "./lib/chain/index.js"
|
|
31
31
|
},
|
|
32
32
|
"./constants": {
|
|
33
|
-
"
|
|
33
|
+
"typescript": "./src/constants/index.ts",
|
|
34
34
|
"types": "./lib/constants/index.d.ts",
|
|
35
35
|
"import": "./lib/constants/index.js"
|
|
36
36
|
},
|
|
37
37
|
"./db": {
|
|
38
|
-
"
|
|
38
|
+
"typescript": "./src/db/index.ts",
|
|
39
39
|
"types": "./lib/db/index.d.ts",
|
|
40
40
|
"import": "./lib/db/index.js"
|
|
41
41
|
},
|
|
42
42
|
"./metrics": {
|
|
43
|
-
"
|
|
43
|
+
"typescript": "./src/metrics/index.ts",
|
|
44
44
|
"types": "./lib/metrics/index.d.ts",
|
|
45
45
|
"import": "./lib/metrics/index.js"
|
|
46
46
|
},
|
|
47
47
|
"./monitoring": {
|
|
48
|
-
"
|
|
48
|
+
"typescript": "./src/monitoring/index.ts",
|
|
49
49
|
"types": "./lib/monitoring/index.d.ts",
|
|
50
50
|
"import": "./lib/monitoring/index.js"
|
|
51
51
|
},
|
|
52
52
|
"./network": {
|
|
53
|
-
"
|
|
53
|
+
"typescript": "./src/network/index.ts",
|
|
54
54
|
"types": "./lib/network/index.d.ts",
|
|
55
55
|
"import": "./lib/network/index.js"
|
|
56
56
|
},
|
|
57
57
|
"./node": {
|
|
58
|
-
"
|
|
58
|
+
"typescript": "./src/node/index.ts",
|
|
59
59
|
"types": "./lib/node/index.d.ts",
|
|
60
60
|
"import": "./lib/node/index.js"
|
|
61
61
|
},
|
|
62
62
|
"./sync": {
|
|
63
|
-
"
|
|
63
|
+
"typescript": "./src/sync/index.ts",
|
|
64
64
|
"types": "./lib/sync/index.d.ts",
|
|
65
65
|
"import": "./lib/sync/index.js"
|
|
66
66
|
},
|
|
67
67
|
"./util": {
|
|
68
|
-
"
|
|
68
|
+
"typescript": "./src/util/index.ts",
|
|
69
69
|
"types": "./lib/util/index.d.ts",
|
|
70
70
|
"import": "./lib/util/index.js"
|
|
71
71
|
}
|
|
72
72
|
},
|
|
73
|
-
"imports": {
|
|
74
|
-
"#prometheus-gc-stats-wrapper": {
|
|
75
|
-
"bun": "./src/bun-wrappers/prometheus-gc-stats.ts",
|
|
76
|
-
"default": "@chainsafe/prometheus-gc-stats"
|
|
77
|
-
},
|
|
78
|
-
"#datastore-wrapper": {
|
|
79
|
-
"bun": "./src/network/peers/datastore_bun.ts",
|
|
80
|
-
"default": "datastore-level"
|
|
81
|
-
}
|
|
82
|
-
},
|
|
83
73
|
"files": [
|
|
84
74
|
"src",
|
|
85
75
|
"lib",
|
|
@@ -136,20 +126,19 @@
|
|
|
136
126
|
"@libp2p/peer-id": "^6.0.4",
|
|
137
127
|
"@libp2p/prometheus-metrics": "^5.0.14",
|
|
138
128
|
"@libp2p/tcp": "^11.0.13",
|
|
139
|
-
"@lodestar/api": "^1.46.0-dev.
|
|
140
|
-
"@lodestar/config": "^1.46.0-dev.
|
|
141
|
-
"@lodestar/db": "^1.46.0-dev.
|
|
142
|
-
"@lodestar/fork-choice": "^1.46.0-dev.
|
|
143
|
-
"@lodestar/logger": "^1.46.0-dev.
|
|
144
|
-
"@lodestar/params": "^1.46.0-dev.
|
|
145
|
-
"@lodestar/reqresp": "^1.46.0-dev.
|
|
146
|
-
"@lodestar/state-transition": "^1.46.0-dev.
|
|
147
|
-
"@lodestar/types": "^1.46.0-dev.
|
|
148
|
-
"@lodestar/utils": "^1.46.0-dev.
|
|
149
|
-
"@lodestar/validator": "^1.46.0-dev.
|
|
129
|
+
"@lodestar/api": "^1.46.0-dev.9b97bb94f2",
|
|
130
|
+
"@lodestar/config": "^1.46.0-dev.9b97bb94f2",
|
|
131
|
+
"@lodestar/db": "^1.46.0-dev.9b97bb94f2",
|
|
132
|
+
"@lodestar/fork-choice": "^1.46.0-dev.9b97bb94f2",
|
|
133
|
+
"@lodestar/logger": "^1.46.0-dev.9b97bb94f2",
|
|
134
|
+
"@lodestar/params": "^1.46.0-dev.9b97bb94f2",
|
|
135
|
+
"@lodestar/reqresp": "^1.46.0-dev.9b97bb94f2",
|
|
136
|
+
"@lodestar/state-transition": "^1.46.0-dev.9b97bb94f2",
|
|
137
|
+
"@lodestar/types": "^1.46.0-dev.9b97bb94f2",
|
|
138
|
+
"@lodestar/utils": "^1.46.0-dev.9b97bb94f2",
|
|
139
|
+
"@lodestar/validator": "^1.46.0-dev.9b97bb94f2",
|
|
150
140
|
"@multiformats/multiaddr": "^13.0.1",
|
|
151
141
|
"datastore-core": "^11.0.2",
|
|
152
|
-
"datastore-fs": "^11.0.2",
|
|
153
142
|
"datastore-level": "^12.0.2",
|
|
154
143
|
"deepmerge": "^4.3.1",
|
|
155
144
|
"fastify": "^5.8.1",
|
|
@@ -169,7 +158,7 @@
|
|
|
169
158
|
"@libp2p/interface-internal": "^3.0.13",
|
|
170
159
|
"@libp2p/logger": "^6.2.2",
|
|
171
160
|
"@libp2p/utils": "^7.0.13",
|
|
172
|
-
"@lodestar/spec-test-util": "^1.46.0-dev.
|
|
161
|
+
"@lodestar/spec-test-util": "^1.46.0-dev.9b97bb94f2",
|
|
173
162
|
"@types/js-yaml": "^4.0.5",
|
|
174
163
|
"@types/qs": "^6.9.7",
|
|
175
164
|
"@types/tmp": "^0.2.3",
|
|
@@ -186,5 +175,5 @@
|
|
|
186
175
|
"beacon",
|
|
187
176
|
"blockchain"
|
|
188
177
|
],
|
|
189
|
-
"gitHead": "
|
|
178
|
+
"gitHead": "31e8100601cb10f866cb2b79797b605fa9914774"
|
|
190
179
|
}
|
|
@@ -32,9 +32,8 @@ export function getLodestarApi({
|
|
|
32
32
|
}: Pick<ApiModules, "chain" | "config" | "db" | "network" | "sync">): ApplicationMethods<routes.lodestar.Endpoints> {
|
|
33
33
|
let writingHeapdump = false;
|
|
34
34
|
let writingProfile = false;
|
|
35
|
-
//
|
|
36
|
-
|
|
37
|
-
const defaultProfileMs = globalThis.Bun ? config.SLOT_DURATION_MS : SLOTS_PER_EPOCH * config.SLOT_DURATION_MS;
|
|
35
|
+
// profile the whole epoch by default
|
|
36
|
+
const defaultProfileMs = SLOTS_PER_EPOCH * config.SLOT_DURATION_MS;
|
|
38
37
|
|
|
39
38
|
return {
|
|
40
39
|
async writeHeapdump({thread = "main", dirpath = "."}) {
|
|
@@ -39,7 +39,6 @@ export class HistoricalStateRegen implements HistoricalStateWorkerApi {
|
|
|
39
39
|
};
|
|
40
40
|
|
|
41
41
|
const worker = new Worker(path.join(WORKER_DIR, "worker.js"), {
|
|
42
|
-
suppressTranspileTS: Boolean(globalThis.Bun),
|
|
43
42
|
workerData,
|
|
44
43
|
} as ConstructorParameters<typeof Worker>[1]);
|
|
45
44
|
|
|
@@ -267,7 +267,6 @@ export class BlsMultiThreadWorkerPool implements IBlsVerifier {
|
|
|
267
267
|
for (let i = 0; i < poolSize; i++) {
|
|
268
268
|
const workerData: WorkerData = {workerId: i};
|
|
269
269
|
const worker = new Worker(path.join(workerDir, "worker.js"), {
|
|
270
|
-
suppressTranspileTS: Boolean(globalThis.Bun),
|
|
271
270
|
workerData,
|
|
272
271
|
} as ConstructorParameters<typeof Worker>[1]);
|
|
273
272
|
|
package/src/chain/chain.ts
CHANGED
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
EpochDifference,
|
|
9
9
|
ForkChoiceStateGetter,
|
|
10
10
|
IForkChoice,
|
|
11
|
+
PayloadStatus,
|
|
11
12
|
ProtoBlock,
|
|
12
13
|
UpdateHeadOpt,
|
|
13
14
|
} from "@lodestar/fork-choice";
|
|
@@ -1190,21 +1191,50 @@ export class BeaconChain implements IBeaconChain {
|
|
|
1190
1191
|
const prevHead = this.forkChoice.getHead();
|
|
1191
1192
|
const head = this.forkChoice.updateAndGetHead({mode: UpdateHeadOpt.GetCanonicalHead}).head;
|
|
1192
1193
|
|
|
1193
|
-
|
|
1194
|
-
|
|
1194
|
+
const headRootChanged = head.blockRoot !== prevHead.blockRoot;
|
|
1195
|
+
|
|
1196
|
+
if (!headRootChanged && prevHead.payloadStatus === head.payloadStatus) {
|
|
1197
|
+
return head;
|
|
1198
|
+
}
|
|
1199
|
+
|
|
1200
|
+
try {
|
|
1201
|
+
const previousDutyDependentRoot = this.forkChoice.getDependentRoot(head, EpochDifference.previous);
|
|
1202
|
+
const currentDutyDependentRoot = this.forkChoice.getDependentRoot(head, EpochDifference.current);
|
|
1203
|
+
const epochTransition = computeStartSlotAtEpoch(computeEpochAtSlot(head.slot)) === head.slot;
|
|
1204
|
+
const executionOptimistic = isOptimisticBlock(head);
|
|
1205
|
+
|
|
1206
|
+
if (headRootChanged) {
|
|
1195
1207
|
this.emitter.emit(routes.events.EventType.head, {
|
|
1196
1208
|
block: head.blockRoot,
|
|
1197
|
-
epochTransition
|
|
1209
|
+
epochTransition,
|
|
1198
1210
|
slot: head.slot,
|
|
1199
1211
|
state: head.stateRoot,
|
|
1200
|
-
previousDutyDependentRoot
|
|
1201
|
-
currentDutyDependentRoot
|
|
1202
|
-
executionOptimistic
|
|
1212
|
+
previousDutyDependentRoot,
|
|
1213
|
+
currentDutyDependentRoot,
|
|
1214
|
+
executionOptimistic,
|
|
1203
1215
|
});
|
|
1204
|
-
} catch (e) {
|
|
1205
|
-
// getDependentRoot() may fail with error: "No block for root" as we can see in holesky non-finality issue
|
|
1206
|
-
this.logger.debug("Error emitting head event", {slot: head.slot, root: head.blockRoot}, e as Error);
|
|
1207
1216
|
}
|
|
1217
|
+
|
|
1218
|
+
this.emitter.emit(routes.events.EventType.headV2, {
|
|
1219
|
+
version: this.config.getForkName(head.slot),
|
|
1220
|
+
data: {
|
|
1221
|
+
slot: head.slot,
|
|
1222
|
+
block: head.blockRoot,
|
|
1223
|
+
state: head.stateRoot,
|
|
1224
|
+
payloadStatus: head.payloadStatus === PayloadStatus.FULL ? "full" : "empty",
|
|
1225
|
+
epochTransition,
|
|
1226
|
+
currentEpochDependentRoot: previousDutyDependentRoot,
|
|
1227
|
+
nextEpochDependentRoot: currentDutyDependentRoot,
|
|
1228
|
+
executionOptimistic,
|
|
1229
|
+
},
|
|
1230
|
+
});
|
|
1231
|
+
} catch (e) {
|
|
1232
|
+
// getDependentRoot() may fail with error: "No block for root" as we can see in holesky non-finality issue
|
|
1233
|
+
this.logger.debug(
|
|
1234
|
+
"Error emitting head/head_v2 event",
|
|
1235
|
+
{slot: head.slot, root: head.blockRoot, headRootChanged},
|
|
1236
|
+
e as Error
|
|
1237
|
+
);
|
|
1208
1238
|
}
|
|
1209
1239
|
|
|
1210
1240
|
return head;
|
|
@@ -111,7 +111,7 @@ export async function validateGossipBlobSidecar(
|
|
|
111
111
|
|
|
112
112
|
// [REJECT] The blob is from a higher slot than its parent.
|
|
113
113
|
if (parentBlock.slot >= blobSlot) {
|
|
114
|
-
throw new BlobSidecarGossipError(GossipAction.
|
|
114
|
+
throw new BlobSidecarGossipError(GossipAction.REJECT, {
|
|
115
115
|
code: BlobSidecarErrorCode.NOT_LATER_THAN_PARENT,
|
|
116
116
|
parentSlot: parentBlock.slot,
|
|
117
117
|
slot: blobSlot,
|
|
@@ -15,6 +15,33 @@ import {ExecutionPayloadBidError, ExecutionPayloadBidErrorCode, GossipAction} fr
|
|
|
15
15
|
import {IBeaconChain} from "../index.js";
|
|
16
16
|
import {RegenCaller} from "../regen/index.js";
|
|
17
17
|
|
|
18
|
+
/**
|
|
19
|
+
* Relative increment over the current highest bid required to forward a bid, in basis points.
|
|
20
|
+
* With 3%, laddering from 1 gwei to 1 ETH takes ~256 bids given the floor and cap below, see
|
|
21
|
+
* https://github.com/ethereum/consensus-specs/pull/4792#issuecomment-3714553549.
|
|
22
|
+
*/
|
|
23
|
+
const BID_INCREMENT_BPS = 300;
|
|
24
|
+
/**
|
|
25
|
+
* Minimum absolute increment (0.0001 ETH). Covers low bid values where the relative increment
|
|
26
|
+
* is tiny and provides weak spam protection.
|
|
27
|
+
*/
|
|
28
|
+
const BID_INCREMENT_FLOOR_GWEI = 100_000;
|
|
29
|
+
/**
|
|
30
|
+
* Maximum absolute increment (0.01 ETH). Bounds the barrier for legitimate competition on
|
|
31
|
+
* high value blocks where the relative increment would suppress closely competing bids.
|
|
32
|
+
*/
|
|
33
|
+
const BID_INCREMENT_CAP_GWEI = 10_000_000;
|
|
34
|
+
|
|
35
|
+
/**
|
|
36
|
+
* Return the minimum value a new bid must have to be forwarded given the current highest bid.
|
|
37
|
+
* Division before multiplication to stay within safe integer range for max gwei values.
|
|
38
|
+
*/
|
|
39
|
+
export function getMinBidValue(currentHighestBid: number): number {
|
|
40
|
+
const relativeIncrement = Math.floor(currentHighestBid / 10_000) * BID_INCREMENT_BPS;
|
|
41
|
+
const increment = Math.min(Math.max(BID_INCREMENT_FLOOR_GWEI, relativeIncrement), BID_INCREMENT_CAP_GWEI);
|
|
42
|
+
return currentHighestBid + increment;
|
|
43
|
+
}
|
|
44
|
+
|
|
18
45
|
export async function validateApiExecutionPayloadBid(
|
|
19
46
|
chain: IBeaconChain,
|
|
20
47
|
signedExecutionPayloadBid: gloas.SignedExecutionPayloadBid
|
|
@@ -231,8 +258,11 @@ async function validateExecutionPayloadBid(
|
|
|
231
258
|
|
|
232
259
|
// [IGNORE] this bid is the highest value bid seen for the tuple
|
|
233
260
|
// `(bid.slot, bid.parent_block_hash, bid.parent_block_root)`.
|
|
261
|
+
// As a DoS prevention measure, the bid must also exceed the current highest bid by a minimum
|
|
262
|
+
// increment, see https://github.com/ethereum/consensus-specs/pull/4831. This prevents spam
|
|
263
|
+
// from builders submitting numerous bids with minimal value increments.
|
|
234
264
|
const bestBid = chain.executionPayloadBidPool.getBestBid(bid.slot, parentBlockHashHex, parentBlockRootHex);
|
|
235
|
-
if (bestBid !== null &&
|
|
265
|
+
if (bestBid !== null && bid.value < getMinBidValue(bestBid.message.value)) {
|
|
236
266
|
throw new ExecutionPayloadBidError(GossipAction.IGNORE, {
|
|
237
267
|
code: ExecutionPayloadBidErrorCode.BID_TOO_LOW,
|
|
238
268
|
bidValue: bid.value,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import {IForkChoice, ProtoBlock} from "@lodestar/fork-choice";
|
|
2
|
-
import {GENESIS_SLOT, MIN_SEED_LOOKAHEAD, SLOTS_PER_EPOCH} from "@lodestar/params";
|
|
2
|
+
import {GENESIS_EPOCH, GENESIS_SLOT, MIN_SEED_LOOKAHEAD, SLOTS_PER_EPOCH} from "@lodestar/params";
|
|
3
3
|
import {
|
|
4
4
|
computeEpochAtSlot,
|
|
5
5
|
computeStartSlotAtEpoch,
|
|
@@ -24,9 +24,10 @@ export async function validateGossipProposerPreferences(
|
|
|
24
24
|
const dependentRootHex = toRootHex(dependentRoot);
|
|
25
25
|
const proposalEpoch = computeEpochAtSlot(proposalSlot);
|
|
26
26
|
|
|
27
|
-
// [IGNORE] `preferences.proposal_slot` is within the proposer lookahead
|
|
28
|
-
|
|
29
|
-
|
|
27
|
+
// [IGNORE] `preferences.proposal_slot` is within the proposer lookahead,
|
|
28
|
+
// allowing for `MAXIMUM_GOSSIP_CLOCK_DISPARITY`.
|
|
29
|
+
const currentEpoch = computeEpochAtSlot(chain.clock.currentSlotWithGossipDisparity);
|
|
30
|
+
if (proposalEpoch > currentEpoch + MIN_SEED_LOOKAHEAD) {
|
|
30
31
|
throw new ProposerPreferencesError(GossipAction.IGNORE, {
|
|
31
32
|
code: ProposerPreferencesErrorCode.INVALID_EPOCH,
|
|
32
33
|
proposalSlot,
|
|
@@ -36,12 +37,11 @@ export async function validateGossipProposerPreferences(
|
|
|
36
37
|
|
|
37
38
|
// [IGNORE] `preferences.proposal_slot` has not already passed, i.e. `proposal_slot > current_slot`,
|
|
38
39
|
// allowing for `MAXIMUM_GOSSIP_CLOCK_DISPARITY`.
|
|
39
|
-
|
|
40
|
-
if (proposalSlot <= currentSlot) {
|
|
40
|
+
if (chain.clock.msFromSlot(proposalSlot) > chain.config.MAXIMUM_GOSSIP_CLOCK_DISPARITY) {
|
|
41
41
|
throw new ProposerPreferencesError(GossipAction.IGNORE, {
|
|
42
42
|
code: ProposerPreferencesErrorCode.PROPOSAL_SLOT_PASSED,
|
|
43
43
|
proposalSlot,
|
|
44
|
-
currentSlot,
|
|
44
|
+
currentSlot: chain.clock.currentSlot,
|
|
45
45
|
});
|
|
46
46
|
}
|
|
47
47
|
|
|
@@ -55,7 +55,7 @@ export async function validateGossipProposerPreferences(
|
|
|
55
55
|
});
|
|
56
56
|
}
|
|
57
57
|
|
|
58
|
-
const dependentEpoch = proposalEpoch - MIN_SEED_LOOKAHEAD;
|
|
58
|
+
const dependentEpoch = Math.max(GENESIS_EPOCH, proposalEpoch - MIN_SEED_LOOKAHEAD);
|
|
59
59
|
const dependentRootSlot = getDependentRootSlot(dependentEpoch);
|
|
60
60
|
|
|
61
61
|
// [REJECT] The slot of the block with root `preferences.dependent_root` is strictly less than
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import {Registry, collectDefaultMetrics} from "prom-client";
|
|
2
|
-
import {gcStats} from "
|
|
2
|
+
import {gcStats} from "@chainsafe/prometheus-gc-stats";
|
|
3
3
|
|
|
4
4
|
export function collectNodeJSMetrics(register: Registry, prefix?: string): () => void {
|
|
5
5
|
collectDefaultMetrics({
|
|
@@ -132,10 +132,6 @@ export class WorkerNetworkCore implements INetworkCore {
|
|
|
132
132
|
|
|
133
133
|
const workerOpts: ConstructorParameters<typeof Worker>[1] = {
|
|
134
134
|
workerData,
|
|
135
|
-
};
|
|
136
|
-
if (globalThis.Bun) {
|
|
137
|
-
workerOpts.suppressTranspileTS = true;
|
|
138
|
-
} else {
|
|
139
135
|
/**
|
|
140
136
|
* maxYoungGenerationSizeMb defaults to 152mb through the cli option defaults.
|
|
141
137
|
* That default value was determined via https://github.com/ChainSafe/lodestar/issues/2115 and
|
|
@@ -147,8 +143,8 @@ export class WorkerNetworkCore implements INetworkCore {
|
|
|
147
143
|
* showed that there is a pretty big window of "correct" values but we can always tune as
|
|
148
144
|
* necessary
|
|
149
145
|
*/
|
|
150
|
-
|
|
151
|
-
}
|
|
146
|
+
resourceLimits: {maxYoungGenerationSizeMb: opts.maxYoungGenerationSizeMb},
|
|
147
|
+
};
|
|
152
148
|
|
|
153
149
|
const worker = new Worker(path.join(workerDir, "networkCoreWorker.js"), workerOpts);
|
|
154
150
|
|
|
@@ -51,10 +51,7 @@ export class Discv5Worker extends (EventEmitter as {new (): StrictEventEmitter<E
|
|
|
51
51
|
loggerOpts: opts.logger.toOpts(),
|
|
52
52
|
genesisTime: opts.genesisTime,
|
|
53
53
|
};
|
|
54
|
-
const worker = new Worker("./worker.js", {
|
|
55
|
-
suppressTranspileTS: Boolean(globalThis.Bun),
|
|
56
|
-
workerData,
|
|
57
|
-
} as ConstructorParameters<typeof Worker>[1]);
|
|
54
|
+
const worker = new Worker("./worker.js", {workerData} as ConstructorParameters<typeof Worker>[1]);
|
|
58
55
|
|
|
59
56
|
const workerApi = await spawn<Discv5WorkerApi>(worker, {
|
|
60
57
|
// A Lodestar Node may do very expensive task at start blocking the event loop and causing
|
|
@@ -9,7 +9,7 @@ import {Libp2pInit, createLibp2p} from "libp2p";
|
|
|
9
9
|
import {Registry} from "prom-client";
|
|
10
10
|
import {ENR} from "@chainsafe/enr";
|
|
11
11
|
import {noise} from "@chainsafe/libp2p-noise";
|
|
12
|
-
import {
|
|
12
|
+
import {defaultCrypto} from "@chainsafe/libp2p-noise/crypto";
|
|
13
13
|
import {quic} from "@chainsafe/libp2p-quic";
|
|
14
14
|
import {Libp2p, LodestarComponents} from "../interface.js";
|
|
15
15
|
import {NetworkOptions, defaultNetworkOptions} from "../options.js";
|
|
@@ -111,14 +111,6 @@ export async function createNodeJsLibp2p(
|
|
|
111
111
|
}
|
|
112
112
|
}
|
|
113
113
|
|
|
114
|
-
const noiseCrypto = {
|
|
115
|
-
...defaultCrypto,
|
|
116
|
-
};
|
|
117
|
-
if (globalThis.Bun) {
|
|
118
|
-
noiseCrypto.chaCha20Poly1305Decrypt = asCrypto.chaCha20Poly1305Decrypt;
|
|
119
|
-
noiseCrypto.chaCha20Poly1305Encrypt = asCrypto.chaCha20Poly1305Encrypt;
|
|
120
|
-
}
|
|
121
|
-
|
|
122
114
|
return createLibp2p({
|
|
123
115
|
privateKey,
|
|
124
116
|
nodeInfo: {
|
|
@@ -130,7 +122,7 @@ export async function createNodeJsLibp2p(
|
|
|
130
122
|
listen: localMultiaddrs,
|
|
131
123
|
announce: [],
|
|
132
124
|
},
|
|
133
|
-
connectionEncrypters: [noise({crypto:
|
|
125
|
+
connectionEncrypters: [noise({crypto: defaultCrypto})],
|
|
134
126
|
transports,
|
|
135
127
|
streamMuxers: [mplex({disconnectThreshold})],
|
|
136
128
|
peerDiscovery,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import {AbortOptions} from "@libp2p/interface";
|
|
2
2
|
import {BaseDatastore} from "datastore-core";
|
|
3
|
+
import {LevelDatastore} from "datastore-level";
|
|
3
4
|
import {Key, KeyQuery, Pair, Query} from "interface-datastore";
|
|
4
|
-
import {LevelDatastore} from "#datastore-wrapper";
|
|
5
5
|
|
|
6
6
|
type MemoryItem = {
|
|
7
7
|
lastAccessedMs: number;
|
package/src/util/profile.ts
CHANGED
|
@@ -8,21 +8,10 @@ export enum ProfileThread {
|
|
|
8
8
|
DISC5 = "discv5",
|
|
9
9
|
}
|
|
10
10
|
|
|
11
|
-
/**
|
|
12
|
-
* The time to take a Bun profile.
|
|
13
|
-
* If we increase this time it'll potentiall cause the app to crash.
|
|
14
|
-
* If we decrease this time, profile recorded will be fragmented and hard to analyze.
|
|
15
|
-
*/
|
|
16
|
-
const BUN_PROFILE_MS = 3 * 1000;
|
|
17
|
-
|
|
18
|
-
export async function profileThread(thread: ProfileThread, durationMs: number, dirpath: string): Promise<string> {
|
|
19
|
-
return globalThis.Bun ? profileBun(thread, durationMs) : profileNodeJS(thread, durationMs, dirpath);
|
|
20
|
-
}
|
|
21
|
-
|
|
22
11
|
/**
|
|
23
12
|
* Take `durationMs` profile of the current thread and return the persisted file path.
|
|
24
13
|
*/
|
|
25
|
-
async function
|
|
14
|
+
export async function profileThread(thread: ProfileThread, durationMs: number, dirpath: string): Promise<string> {
|
|
26
15
|
const inspector = await import("node:inspector");
|
|
27
16
|
|
|
28
17
|
// due to some typing issues, not able to use promisify here
|
|
@@ -54,25 +43,6 @@ async function profileNodeJS(thread: ProfileThread, durationMs: number, dirpath:
|
|
|
54
43
|
return filePath;
|
|
55
44
|
}
|
|
56
45
|
|
|
57
|
-
/**
|
|
58
|
-
* Unlike NodeJS, Bun console.profile() api flush data to the inspector,
|
|
59
|
-
* so this api returns ms taken of this profile instead of file path.
|
|
60
|
-
*/
|
|
61
|
-
async function profileBun(thread: ProfileThread, durationMs: number): Promise<string> {
|
|
62
|
-
const start = Date.now();
|
|
63
|
-
let now = Date.now();
|
|
64
|
-
while (now - start < durationMs) {
|
|
65
|
-
// biome-ignore lint/suspicious/noConsole: need to use console api to profile in Bun
|
|
66
|
-
console.profile(String(now));
|
|
67
|
-
await sleep(BUN_PROFILE_MS);
|
|
68
|
-
// biome-ignore lint/suspicious/noConsole: need to use console api to profile in Bun
|
|
69
|
-
console.profileEnd(String(now));
|
|
70
|
-
now = Date.now();
|
|
71
|
-
}
|
|
72
|
-
|
|
73
|
-
return `Successfully take Bun ${thread} thread profile in ${now - start}ms. Check your inspector to see the profile.`;
|
|
74
|
-
}
|
|
75
|
-
|
|
76
46
|
/**
|
|
77
47
|
* Write heap snapshot of the current thread to the specified file.
|
|
78
48
|
*/
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"prometheus-gc-stats.d.ts","sourceRoot":"","sources":["../../src/bun-wrappers/prometheus-gc-stats.ts"],"names":[],"mappings":"AAIA,wBAAgB,OAAO,eAEtB"}
|
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
// Bun does not support `GCProfiler` from `node:v8`a
|
|
2
|
-
// Which is exposed from `@chainsafe/prometheus-gc-stats` and used in `packages/beacon-node/src/metrics/nodeJsMetrics.ts`
|
|
3
|
-
// So we expose a dummy function for Bun runtime which do nothing for now
|
|
4
|
-
// TODO: May look get some useful data from `bun:jsc`
|
|
5
|
-
export function gcStats() {
|
|
6
|
-
return () => { };
|
|
7
|
-
}
|
|
8
|
-
//# sourceMappingURL=prometheus-gc-stats.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"prometheus-gc-stats.js","sourceRoot":"","sources":["../../src/bun-wrappers/prometheus-gc-stats.ts"],"names":[],"mappings":"AAAA,oDAAoD;AACpD,yHAAyH;AACzH,yEAAyE;AACzE,qDAAqD;AACrD,MAAM,UAAU,OAAO,GAAG;IACxB,OAAO,GAAG,EAAE,CAAC,EAAC,CAAC,CAAC;AAAA,CACjB"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"datastore_bun.d.ts","sourceRoot":"","sources":["../../../src/network/peers/datastore_bun.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,cAAc,CAAC;AAEzC,eAAO,MAAM,cAAc,oBAAc,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"datastore_bun.js","sourceRoot":"","sources":["../../../src/network/peers/datastore_bun.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,cAAc,CAAC;AAEzC,MAAM,CAAC,MAAM,cAAc,GAAG,WAAW,CAAC"}
|
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
// Bun does not support `GCProfiler` from `node:v8`a
|
|
2
|
-
// Which is exposed from `@chainsafe/prometheus-gc-stats` and used in `packages/beacon-node/src/metrics/nodeJsMetrics.ts`
|
|
3
|
-
// So we expose a dummy function for Bun runtime which do nothing for now
|
|
4
|
-
// TODO: May look get some useful data from `bun:jsc`
|
|
5
|
-
export function gcStats() {
|
|
6
|
-
return () => {};
|
|
7
|
-
}
|