@lodestar/beacon-node 1.17.0-dev.3ef43ef0fe → 1.17.0-dev.4857f4354f

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.
Files changed (83) hide show
  1. package/lib/api/impl/beacon/rewards/index.js +5 -0
  2. package/lib/api/impl/beacon/rewards/index.js.map +1 -1
  3. package/lib/chain/archiver/archiveStates.js +21 -6
  4. package/lib/chain/archiver/archiveStates.js.map +1 -1
  5. package/lib/chain/blocks/importBlock.js +2 -1
  6. package/lib/chain/blocks/importBlock.js.map +1 -1
  7. package/lib/chain/blocks/types.d.ts +3 -1
  8. package/lib/chain/blocks/types.js +16 -1
  9. package/lib/chain/blocks/types.js.map +1 -1
  10. package/lib/chain/blocks/verifyBlock.js +1 -0
  11. package/lib/chain/blocks/verifyBlock.js.map +1 -1
  12. package/lib/chain/blocks/verifyBlocksDataAvailability.js +4 -3
  13. package/lib/chain/blocks/verifyBlocksDataAvailability.js.map +1 -1
  14. package/lib/chain/chain.d.ts +2 -0
  15. package/lib/chain/chain.js +9 -1
  16. package/lib/chain/chain.js.map +1 -1
  17. package/lib/chain/interface.d.ts +2 -0
  18. package/lib/chain/interface.js.map +1 -1
  19. package/lib/chain/opPools/aggregatedAttestationPool.d.ts +6 -5
  20. package/lib/chain/opPools/aggregatedAttestationPool.js +5 -3
  21. package/lib/chain/opPools/aggregatedAttestationPool.js.map +1 -1
  22. package/lib/chain/prepareNextSlot.js +1 -0
  23. package/lib/chain/prepareNextSlot.js.map +1 -1
  24. package/lib/chain/produceBlock/produceBlockBody.js +1 -1
  25. package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
  26. package/lib/chain/regen/errors.d.ts +7 -1
  27. package/lib/chain/regen/errors.js +1 -0
  28. package/lib/chain/regen/errors.js.map +1 -1
  29. package/lib/chain/regen/interface.d.ts +2 -1
  30. package/lib/chain/regen/queued.d.ts +19 -4
  31. package/lib/chain/regen/queued.js +42 -13
  32. package/lib/chain/regen/queued.js.map +1 -1
  33. package/lib/chain/regen/regen.d.ts +15 -6
  34. package/lib/chain/regen/regen.js +62 -24
  35. package/lib/chain/regen/regen.js.map +1 -1
  36. package/lib/chain/rewards/syncCommitteeRewards.d.ts +6 -0
  37. package/lib/chain/rewards/syncCommitteeRewards.js +36 -0
  38. package/lib/chain/rewards/syncCommitteeRewards.js.map +1 -0
  39. package/lib/chain/seenCache/seenAttestationData.d.ts +1 -1
  40. package/lib/chain/seenCache/seenGossipBlockInput.d.ts +6 -1
  41. package/lib/chain/seenCache/seenGossipBlockInput.js +9 -17
  42. package/lib/chain/seenCache/seenGossipBlockInput.js.map +1 -1
  43. package/lib/chain/stateCache/fifoBlockStateCache.d.ts +2 -1
  44. package/lib/chain/stateCache/fifoBlockStateCache.js +2 -2
  45. package/lib/chain/stateCache/fifoBlockStateCache.js.map +1 -1
  46. package/lib/chain/stateCache/persistentCheckpointsCache.d.ts +6 -5
  47. package/lib/chain/stateCache/persistentCheckpointsCache.js +18 -17
  48. package/lib/chain/stateCache/persistentCheckpointsCache.js.map +1 -1
  49. package/lib/chain/stateCache/stateContextCache.d.ts +2 -1
  50. package/lib/chain/stateCache/stateContextCache.js +2 -2
  51. package/lib/chain/stateCache/stateContextCache.js.map +1 -1
  52. package/lib/chain/stateCache/stateContextCheckpointsCache.d.ts +5 -4
  53. package/lib/chain/stateCache/stateContextCheckpointsCache.js +10 -9
  54. package/lib/chain/stateCache/stateContextCheckpointsCache.js.map +1 -1
  55. package/lib/chain/stateCache/types.d.ts +6 -5
  56. package/lib/chain/stateCache/types.js.map +1 -1
  57. package/lib/chain/validation/aggregateAndProof.d.ts +2 -2
  58. package/lib/chain/validation/aggregateAndProof.js.map +1 -1
  59. package/lib/chain/validation/attestation.d.ts +1 -1
  60. package/lib/chain/validation/attestation.js.map +1 -1
  61. package/lib/metrics/metrics/lodestar.d.ts +8 -1
  62. package/lib/metrics/metrics/lodestar.js +10 -0
  63. package/lib/metrics/metrics/lodestar.js.map +1 -1
  64. package/lib/network/events.d.ts +5 -0
  65. package/lib/network/events.js +2 -0
  66. package/lib/network/events.js.map +1 -1
  67. package/lib/network/processor/gossipHandlers.js +7 -4
  68. package/lib/network/processor/gossipHandlers.js.map +1 -1
  69. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.d.ts +2 -0
  70. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.js +39 -1
  71. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.js.map +1 -1
  72. package/lib/sync/interface.d.ts +15 -4
  73. package/lib/sync/interface.js +1 -0
  74. package/lib/sync/interface.js.map +1 -1
  75. package/lib/sync/unknownBlock.d.ts +9 -0
  76. package/lib/sync/unknownBlock.js +127 -14
  77. package/lib/sync/unknownBlock.js.map +1 -1
  78. package/lib/sync/utils/pendingBlocksTree.js +5 -2
  79. package/lib/sync/utils/pendingBlocksTree.js.map +1 -1
  80. package/lib/util/multifork.d.ts +2 -1
  81. package/lib/util/multifork.js +4 -1
  82. package/lib/util/multifork.js.map +1 -1
  83. package/package.json +16 -18
@@ -3,10 +3,11 @@ import { pruneSetToMax } from "@lodestar/utils";
3
3
  import { INTERVALS_PER_SLOT } from "@lodestar/params";
4
4
  import { sleep } from "@lodestar/utils";
5
5
  import { NetworkEvent, PeerAction } from "../network/index.js";
6
+ import { BlockInputType } from "../chain/blocks/types.js";
6
7
  import { shuffle } from "../util/shuffle.js";
7
8
  import { byteArrayEquals } from "../util/bytes.js";
8
9
  import { BlockError, BlockErrorCode } from "../chain/errors/index.js";
9
- import { beaconBlocksMaybeBlobsByRoot } from "../network/reqresp/beaconBlocksMaybeBlobsByRoot.js";
10
+ import { beaconBlocksMaybeBlobsByRoot, unavailableBeaconBlobsByRoot, } from "../network/reqresp/beaconBlocksMaybeBlobsByRoot.js";
10
11
  import { wrapError } from "../util/wrapError.js";
11
12
  import { PendingBlockStatus, PendingBlockType } from "./interface.js";
12
13
  import { getDescendantBlocks, getAllDescendantBlocks, getUnknownAndAncestorBlocks } from "./utils/pendingBlocksTree.js";
@@ -40,6 +41,19 @@ export class UnknownBlockSync {
40
41
  this.logger.debug("Error handling unknownBlock event", {}, e);
41
42
  }
42
43
  };
44
+ /**
45
+ * Process an unknownBlockInput event and register the block in `pendingBlocks` Map.
46
+ */
47
+ this.onUnknownBlockInput = (data) => {
48
+ try {
49
+ this.addUnknownBlock(data.blockInput, data.peer);
50
+ this.triggerUnknownBlockSearch();
51
+ this.metrics?.syncUnknownBlock.requests.inc({ type: PendingBlockType.UNKNOWN_BLOCKINPUT });
52
+ }
53
+ catch (e) {
54
+ this.logger.debug("Error handling unknownBlockInput event", {}, e);
55
+ }
56
+ };
43
57
  /**
44
58
  * Process an unknownBlockParent event and register the block in `pendingBlocks` Map.
45
59
  */
@@ -108,6 +122,7 @@ export class UnknownBlockSync {
108
122
  if (!this.subscribedToNetworkEvents) {
109
123
  this.logger.verbose("UnknownBlockSync enabled.");
110
124
  this.network.events.on(NetworkEvent.unknownBlock, this.onUnknownBlock);
125
+ this.network.events.on(NetworkEvent.unknownBlockInput, this.onUnknownBlockInput);
111
126
  this.network.events.on(NetworkEvent.unknownBlockParent, this.onUnknownParent);
112
127
  this.network.events.on(NetworkEvent.peerConnected, this.triggerUnknownBlockSearch);
113
128
  this.subscribedToNetworkEvents = true;
@@ -120,6 +135,7 @@ export class UnknownBlockSync {
120
135
  unsubscribeFromNetwork() {
121
136
  this.logger.verbose("UnknownBlockSync disabled.");
122
137
  this.network.events.off(NetworkEvent.unknownBlock, this.onUnknownBlock);
138
+ this.network.events.off(NetworkEvent.unknownBlockInput, this.onUnknownBlockInput);
123
139
  this.network.events.off(NetworkEvent.unknownBlockParent, this.onUnknownParent);
124
140
  this.network.events.off(NetworkEvent.peerConnected, this.triggerUnknownBlockSearch);
125
141
  this.subscribedToNetworkEvents = false;
@@ -164,19 +180,41 @@ export class UnknownBlockSync {
164
180
  // add 1 pending block with status pending
165
181
  this.addUnknownBlock(parentBlockRootHex, peerIdStr);
166
182
  }
167
- addUnknownBlock(blockRootHex, peerIdStr) {
183
+ addUnknownBlock(blockInputOrRootHex, peerIdStr) {
184
+ let blockRootHex;
185
+ let blockInput;
186
+ if (typeof blockInputOrRootHex === "string") {
187
+ blockRootHex = blockInputOrRootHex;
188
+ blockInput = null;
189
+ }
190
+ else {
191
+ const { block } = blockInputOrRootHex;
192
+ blockRootHex = toHexString(this.config.getForkTypes(block.message.slot).BeaconBlock.hashTreeRoot(block.message));
193
+ blockInput = blockInputOrRootHex;
194
+ }
168
195
  let pendingBlock = this.pendingBlocks.get(blockRootHex);
169
196
  if (!pendingBlock) {
170
197
  pendingBlock = {
171
198
  blockRootHex,
172
199
  parentBlockRootHex: null,
173
- blockInput: null,
200
+ blockInput: blockInput?.type === BlockInputType.blobsPromise ? blockInput : null,
174
201
  peerIdStrs: new Set(),
175
202
  status: PendingBlockStatus.pending,
176
203
  downloadAttempts: 0,
177
204
  };
178
205
  this.pendingBlocks.set(blockRootHex, pendingBlock);
179
- this.logger.verbose("Added unknown block to pendingBlocks", { root: blockRootHex });
206
+ if (pendingBlock.blockInput?.type === BlockInputType.blobsPromise) {
207
+ this.logger.verbose("Added blockInput with unknown blobs to pendingBlocks", {
208
+ root: blockRootHex,
209
+ slot: blockInput?.block.message.slot ?? "unknown",
210
+ });
211
+ }
212
+ else {
213
+ this.logger.verbose("Added unknown block to pendingBlocks", {
214
+ root: blockRootHex,
215
+ slot: blockInput?.block.message.slot ?? "unknown",
216
+ });
217
+ }
180
218
  }
181
219
  if (peerIdStr) {
182
220
  pendingBlock.peerIdStrs.add(peerIdStr);
@@ -191,12 +229,29 @@ export class UnknownBlockSync {
191
229
  if (block.status !== PendingBlockStatus.pending) {
192
230
  return;
193
231
  }
194
- this.logger.verbose("Downloading unknown block", {
195
- root: block.blockRootHex,
196
- pendingBlocks: this.pendingBlocks.size,
197
- });
232
+ if (block.blockInput?.type === BlockInputType.blobsPromise) {
233
+ this.logger.verbose("Downloading unknown blockInput", {
234
+ root: block.blockRootHex,
235
+ pendingBlocks: this.pendingBlocks.size,
236
+ blockInputType: block.blockInput.type,
237
+ slot: block.blockInput?.block.message.slot ?? "unknown",
238
+ });
239
+ }
240
+ else {
241
+ this.logger.verbose("Downloading unknown block", {
242
+ root: block.blockRootHex,
243
+ pendingBlocks: this.pendingBlocks.size,
244
+ slot: block.blockInput?.block.message.slot ?? "unknown",
245
+ });
246
+ }
198
247
  block.status = PendingBlockStatus.fetching;
199
- const res = await wrapError(this.fetchUnknownBlockRoot(fromHexString(block.blockRootHex), connectedPeers));
248
+ let res;
249
+ if (block.blockInput === null) {
250
+ res = await wrapError(this.fetchUnknownBlockRoot(fromHexString(block.blockRootHex), connectedPeers));
251
+ }
252
+ else {
253
+ res = await wrapError(this.fetchUnavailableBlockInput(block.blockInput, connectedPeers));
254
+ }
200
255
  if (res.err)
201
256
  this.metrics?.syncUnknownBlock.downloadedBlocksError.inc();
202
257
  else
@@ -215,11 +270,22 @@ export class UnknownBlockSync {
215
270
  const delaySec = Date.now() / 1000 - (this.chain.genesisTime + blockSlot * this.config.SECONDS_PER_SLOT);
216
271
  this.metrics?.syncUnknownBlock.elapsedTimeTillReceived.observe(delaySec);
217
272
  const parentInForkchoice = this.chain.forkChoice.hasBlock(blockInput.block.message.parentRoot);
218
- this.logger.verbose("Downloaded unknown block", {
219
- root: block.blockRootHex,
220
- pendingBlocks: this.pendingBlocks.size,
221
- parentInForkchoice,
222
- });
273
+ if (block.blockInput.type === BlockInputType.blobsPromise) {
274
+ this.logger.verbose("Downloaded unknown blobs", {
275
+ root: block.blockRootHex,
276
+ pendingBlocks: this.pendingBlocks.size,
277
+ parentInForkchoice,
278
+ blockInputType: blockInput.type,
279
+ });
280
+ }
281
+ else {
282
+ this.logger.verbose("Downloaded unknown block", {
283
+ root: block.blockRootHex,
284
+ pendingBlocks: this.pendingBlocks.size,
285
+ parentInForkchoice,
286
+ blockInputType: blockInput.type,
287
+ });
288
+ }
223
289
  if (parentInForkchoice) {
224
290
  // Bingo! Process block. Add to pending blocks anyway for recycle the cache that prevents duplicate processing
225
291
  this.processBlock(block).catch((e) => {
@@ -385,6 +451,53 @@ export class UnknownBlockSync {
385
451
  throw Error(`Error fetching UnknownBlockRoot after ${MAX_ATTEMPTS_PER_BLOCK}: unknown error`);
386
452
  }
387
453
  }
454
+ /**
455
+ * Fetches missing blobs for the blockinput, in future can also pull block is thats also missing
456
+ * along with the blobs (i.e. only some blobs are available)
457
+ */
458
+ async fetchUnavailableBlockInput(unavailableBlockInput, connectedPeers) {
459
+ if (unavailableBlockInput.type !== BlockInputType.blobsPromise) {
460
+ return { blockInput: unavailableBlockInput, peerIdStr: "" };
461
+ }
462
+ const shuffledPeers = shuffle(connectedPeers);
463
+ const unavailableBlock = unavailableBlockInput.block;
464
+ const blockRoot = this.config
465
+ .getForkTypes(unavailableBlock.message.slot)
466
+ .BeaconBlock.hashTreeRoot(unavailableBlock.message);
467
+ const blockRootHex = toHexString(blockRoot);
468
+ const blobKzgCommitmentsLen = unavailableBlock.message.body.blobKzgCommitments.length;
469
+ const pendingBlobs = blobKzgCommitmentsLen - unavailableBlockInput.blobsCache.size;
470
+ let lastError = null;
471
+ for (let i = 0; i < MAX_ATTEMPTS_PER_BLOCK; i++) {
472
+ const peer = shuffledPeers[i % shuffledPeers.length];
473
+ try {
474
+ const blockInput = await unavailableBeaconBlobsByRoot(this.config, this.network, peer, unavailableBlockInput, this.metrics);
475
+ // Peer does not have the block, try with next peer
476
+ if (blockInput === undefined) {
477
+ continue;
478
+ }
479
+ // Verify block root is correct
480
+ const block = blockInput.block.message;
481
+ const receivedBlockRoot = this.config.getForkTypes(block.slot).BeaconBlock.hashTreeRoot(block);
482
+ if (!byteArrayEquals(receivedBlockRoot, blockRoot)) {
483
+ throw Error(`Wrong block received by peer, got ${toHexString(receivedBlockRoot)} expected ${blockRootHex}`);
484
+ }
485
+ this.logger.debug("Fetched UnavailableBlockInput", { attempts: i, pendingBlobs, blobKzgCommitmentsLen });
486
+ return { blockInput, peerIdStr: peer };
487
+ }
488
+ catch (e) {
489
+ this.logger.debug("Error fetching UnavailableBlockInput", { attempt: i, blockRootHex, peer }, e);
490
+ lastError = e;
491
+ }
492
+ }
493
+ if (lastError) {
494
+ lastError.message = `Error fetching UnavailableBlockInput after ${MAX_ATTEMPTS_PER_BLOCK} attempts: ${lastError.message}`;
495
+ throw lastError;
496
+ }
497
+ else {
498
+ throw Error(`Error fetching UnavailableBlockInput after ${MAX_ATTEMPTS_PER_BLOCK}: unknown error`);
499
+ }
500
+ }
388
501
  /**
389
502
  * Gets all descendant blocks of `block` recursively from `pendingBlocks`.
390
503
  * Assumes that if a parent block does not exist or is not processable, all descendant blocks are bad too.
@@ -1 +1 @@
1
- {"version":3,"file":"unknownBlock.js","sourceRoot":"","sources":["../../src/sync/unknownBlock.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"unknownBlock.js","sourceRoot":"","sources":["../../src/sync/unknownBlock.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  import { MapDef } from "@lodestar/utils";
2
2
  import { PendingBlockStatus, } from "../interface.js";
3
+ import { BlockInputType } from "../../chain/blocks/types.js";
3
4
  export function getAllDescendantBlocks(blockRootHex, blocks) {
4
5
  // Do one pass over all blocks to index by parent
5
6
  const byParent = new MapDef(() => []);
@@ -43,10 +44,12 @@ export function getUnknownAndAncestorBlocks(blocks) {
43
44
  const ancestors = [];
44
45
  for (const block of blocks.values()) {
45
46
  const parentHex = block.parentBlockRootHex;
46
- if (block.status === PendingBlockStatus.pending && block.blockInput == null && parentHex == null) {
47
+ if (block.status === PendingBlockStatus.pending &&
48
+ (block.blockInput == null || block.blockInput.type === BlockInputType.blobsPromise) &&
49
+ parentHex == null) {
47
50
  unknowns.push(block);
48
51
  }
49
- if (parentHex && !blocks.has(parentHex)) {
52
+ if (block.status === PendingBlockStatus.downloaded && parentHex && !blocks.has(parentHex)) {
50
53
  ancestors.push(block);
51
54
  }
52
55
  }
@@ -1 +1 @@
1
- {"version":3,"file":"pendingBlocksTree.js","sourceRoot":"","sources":["../../../src/sync/utils/pendingBlocksTree.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAC,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAGL,kBAAkB,GAGnB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,UAAU,sBAAsB,CAAC,YAAqB,EAAE,MAAkC;IAC9F,iDAAiD;IACjD,MAAM,QAAQ,GAAG,IAAI,MAAM,CAA0B,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IAC/D,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QACpC,IAAI,KAAK,CAAC,kBAAkB,IAAI,IAAI,EAAE,CAAC;YACrC,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IAED,wEAAwE;IACxE,OAAO,qBAAqB,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;AACvD,CAAC;AAED,wDAAwD;AACxD,SAAS,qBAAqB,CAC5B,iBAAyB,EACzB,QAAsC,EACtC,mBAAmC,EAAE;IAErC,MAAM,qBAAqB,GAAG,QAAQ,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAC9D,IAAI,qBAAqB,EAAE,CAAC;QAC1B,KAAK,MAAM,oBAAoB,IAAI,qBAAqB,EAAE,CAAC;YACzD,gBAAgB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YAC5C,qBAAqB,CAAC,oBAAoB,CAAC,YAAY,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC;QACvF,CAAC;IACH,CAAC;IACD,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,YAAqB,EAAE,MAAkC;IAC3F,MAAM,gBAAgB,GAAmB,EAAE,CAAC;IAE5C,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QACpC,IAAI,KAAK,CAAC,kBAAkB,KAAK,YAAY,EAAE,CAAC;YAC9C,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,2BAA2B,CAAC,MAAkC;IAC5E,MAAM,QAAQ,GAAmB,EAAE,CAAC;IACpC,MAAM,SAAS,GAAsB,EAAE,CAAC;IAExC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QACpC,MAAM,SAAS,GAAG,KAAK,CAAC,kBAAkB,CAAC;QAC3C,IAAI,KAAK,CAAC,MAAM,KAAK,kBAAkB,CAAC,OAAO,IAAI,KAAK,CAAC,UAAU,IAAI,IAAI,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;YACjG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC;QAED,IAAI,SAAS,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YACxC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IAED,OAAO,EAAC,QAAQ,EAAE,SAAS,EAAC,CAAC;AAC/B,CAAC"}
1
+ {"version":3,"file":"pendingBlocksTree.js","sourceRoot":"","sources":["../../../src/sync/utils/pendingBlocksTree.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAC,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAGL,kBAAkB,GAInB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAE3D,MAAM,UAAU,sBAAsB,CAAC,YAAqB,EAAE,MAAkC;IAC9F,iDAAiD;IACjD,MAAM,QAAQ,GAAG,IAAI,MAAM,CAA0B,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IAC/D,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QACpC,IAAI,KAAK,CAAC,kBAAkB,IAAI,IAAI,EAAE,CAAC;YACrC,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IAED,wEAAwE;IACxE,OAAO,qBAAqB,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;AACvD,CAAC;AAED,wDAAwD;AACxD,SAAS,qBAAqB,CAC5B,iBAAyB,EACzB,QAAsC,EACtC,mBAAmC,EAAE;IAErC,MAAM,qBAAqB,GAAG,QAAQ,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAC9D,IAAI,qBAAqB,EAAE,CAAC;QAC1B,KAAK,MAAM,oBAAoB,IAAI,qBAAqB,EAAE,CAAC;YACzD,gBAAgB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YAC5C,qBAAqB,CAAC,oBAAoB,CAAC,YAAY,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC;QACvF,CAAC;IACH,CAAC;IACD,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,YAAqB,EAAE,MAAkC;IAC3F,MAAM,gBAAgB,GAAmB,EAAE,CAAC;IAE5C,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QACpC,IAAI,KAAK,CAAC,kBAAkB,KAAK,YAAY,EAAE,CAAC;YAC9C,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,2BAA2B,CAAC,MAAkC;IAC5E,MAAM,QAAQ,GAAyC,EAAE,CAAC;IAC1D,MAAM,SAAS,GAAsB,EAAE,CAAC;IAExC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QACpC,MAAM,SAAS,GAAG,KAAK,CAAC,kBAAkB,CAAC;QAC3C,IACE,KAAK,CAAC,MAAM,KAAK,kBAAkB,CAAC,OAAO;YAC3C,CAAC,KAAK,CAAC,UAAU,IAAI,IAAI,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,KAAK,cAAc,CAAC,YAAY,CAAC;YACnF,SAAS,IAAI,IAAI,EACjB,CAAC;YACD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC;QAED,IAAI,KAAK,CAAC,MAAM,KAAK,kBAAkB,CAAC,UAAU,IAAI,SAAS,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YAC1F,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IAED,OAAO,EAAC,QAAQ,EAAE,SAAS,EAAC,CAAC;AAC/B,CAAC"}
@@ -1,7 +1,8 @@
1
1
  /// <reference types="node" />
2
2
  import { ChainForkConfig } from "@lodestar/config";
3
- import { allForks } from "@lodestar/types";
3
+ import { Slot, allForks } from "@lodestar/types";
4
4
  export declare function getSignedBlockTypeFromBytes(config: ChainForkConfig, bytes: Buffer | Uint8Array): allForks.AllForksSSZTypes["SignedBeaconBlock"];
5
5
  export declare function getStateTypeFromBytes(config: ChainForkConfig, bytes: Buffer | Uint8Array): allForks.AllForksSSZTypes["BeaconState"];
6
+ export declare function getStateSlotFromBytes(bytes: Uint8Array): Slot;
6
7
  export declare function getLightClientHeaderTypeFromBytes(config: ChainForkConfig, bytes: Buffer | Uint8Array): allForks.AllForksLightClientSSZTypes["LightClientHeader"];
7
8
  //# sourceMappingURL=multifork.d.ts.map
@@ -23,9 +23,12 @@ export function getSignedBlockTypeFromBytes(config, bytes) {
23
23
  return config.getForkTypes(slot).SignedBeaconBlock;
24
24
  }
25
25
  export function getStateTypeFromBytes(config, bytes) {
26
- const slot = bytesToInt(bytes.subarray(SLOT_BYTES_POSITION_IN_STATE, SLOT_BYTES_POSITION_IN_STATE + SLOT_BYTE_COUNT));
26
+ const slot = getStateSlotFromBytes(bytes);
27
27
  return config.getForkTypes(slot).BeaconState;
28
28
  }
29
+ export function getStateSlotFromBytes(bytes) {
30
+ return bytesToInt(bytes.subarray(SLOT_BYTES_POSITION_IN_STATE, SLOT_BYTES_POSITION_IN_STATE + SLOT_BYTE_COUNT));
31
+ }
29
32
  /**
30
33
  * First field in update is beacon, first field in beacon is slot
31
34
  *
@@ -1 +1 @@
1
- {"version":3,"file":"multifork.js","sourceRoot":"","sources":["../../src/util/multifork.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAC,sCAAsC,EAAC,MAAM,eAAe,CAAC;AAErE;;GAEG;AACH,MAAM,eAAe,GAAG,CAAC,CAAC;AAE1B;;;;;;;;;GASG;AACH,MAAM,4BAA4B,GAAG,EAAE,CAAC;AAExC,MAAM,UAAU,2BAA2B,CACzC,MAAuB,EACvB,KAA0B;IAE1B,MAAM,IAAI,GAAG,sCAAsC,CAAC,KAAK,CAAC,CAAC;IAC3D,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAClB,MAAM,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,iBAAiB,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,MAAuB,EACvB,KAA0B;IAE1B,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,4BAA4B,EAAE,4BAA4B,GAAG,eAAe,CAAC,CAAC,CAAC;IACtH,OAAO,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC;AAC/C,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,wCAAwC,GAAG,CAAC,CAAC;AACnD,MAAM,UAAU,iCAAiC,CAC/C,MAAuB,EACvB,KAA0B;IAE1B,MAAM,IAAI,GAAG,UAAU,CACrB,KAAK,CAAC,QAAQ,CAAC,wCAAwC,EAAE,wCAAwC,GAAG,eAAe,CAAC,CACrH,CAAC;IACF,OAAO,MAAM,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC,iBAAiB,CAAC;AAChE,CAAC"}
1
+ {"version":3,"file":"multifork.js","sourceRoot":"","sources":["../../src/util/multifork.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAC,sCAAsC,EAAC,MAAM,eAAe,CAAC;AAErE;;GAEG;AACH,MAAM,eAAe,GAAG,CAAC,CAAC;AAE1B;;;;;;;;;GASG;AACH,MAAM,4BAA4B,GAAG,EAAE,CAAC;AAExC,MAAM,UAAU,2BAA2B,CACzC,MAAuB,EACvB,KAA0B;IAE1B,MAAM,IAAI,GAAG,sCAAsC,CAAC,KAAK,CAAC,CAAC;IAC3D,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAClB,MAAM,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,iBAAiB,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,MAAuB,EACvB,KAA0B;IAE1B,MAAM,IAAI,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;IAC1C,OAAO,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAiB;IACrD,OAAO,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,4BAA4B,EAAE,4BAA4B,GAAG,eAAe,CAAC,CAAC,CAAC;AAClH,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,wCAAwC,GAAG,CAAC,CAAC;AACnD,MAAM,UAAU,iCAAiC,CAC/C,MAAuB,EACvB,KAA0B;IAE1B,MAAM,IAAI,GAAG,UAAU,CACrB,KAAK,CAAC,QAAQ,CAAC,wCAAwC,EAAE,wCAAwC,GAAG,eAAe,CAAC,CACrH,CAAC;IACF,OAAO,MAAM,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC,iBAAiB,CAAC;AAChE,CAAC"}
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.17.0-dev.3ef43ef0fe",
14
+ "version": "1.17.0-dev.4857f4354f",
15
15
  "type": "module",
16
16
  "exports": {
17
17
  ".": {
@@ -94,7 +94,7 @@
94
94
  "dependencies": {
95
95
  "@chainsafe/as-sha256": "^0.4.1",
96
96
  "@chainsafe/bls": "7.1.3",
97
- "@chainsafe/blst": "^0.2.9",
97
+ "@chainsafe/blst": "^0.2.10",
98
98
  "@chainsafe/discv5": "^9.0.0",
99
99
  "@chainsafe/enr": "^3.0.0",
100
100
  "@chainsafe/libp2p-gossipsub": "^11.2.1",
@@ -102,7 +102,7 @@
102
102
  "@chainsafe/libp2p-noise": "^14.1.0",
103
103
  "@chainsafe/persistent-merkle-tree": "^0.6.1",
104
104
  "@chainsafe/prometheus-gc-stats": "^1.0.0",
105
- "@chainsafe/ssz": "^0.14.0",
105
+ "@chainsafe/ssz": "^0.14.3",
106
106
  "@chainsafe/threads": "^1.11.1",
107
107
  "@ethersproject/abi": "^5.7.0",
108
108
  "@fastify/bearer-auth": "^9.0.0",
@@ -118,18 +118,18 @@
118
118
  "@libp2p/peer-id-factory": "^4.0.3",
119
119
  "@libp2p/prometheus-metrics": "^3.0.10",
120
120
  "@libp2p/tcp": "9.0.10",
121
- "@lodestar/api": "1.17.0-dev.3ef43ef0fe",
122
- "@lodestar/config": "1.17.0-dev.3ef43ef0fe",
123
- "@lodestar/db": "1.17.0-dev.3ef43ef0fe",
124
- "@lodestar/fork-choice": "1.17.0-dev.3ef43ef0fe",
125
- "@lodestar/light-client": "1.17.0-dev.3ef43ef0fe",
126
- "@lodestar/logger": "1.17.0-dev.3ef43ef0fe",
127
- "@lodestar/params": "1.17.0-dev.3ef43ef0fe",
128
- "@lodestar/reqresp": "1.17.0-dev.3ef43ef0fe",
129
- "@lodestar/state-transition": "1.17.0-dev.3ef43ef0fe",
130
- "@lodestar/types": "1.17.0-dev.3ef43ef0fe",
131
- "@lodestar/utils": "1.17.0-dev.3ef43ef0fe",
132
- "@lodestar/validator": "1.17.0-dev.3ef43ef0fe",
121
+ "@lodestar/api": "1.17.0-dev.4857f4354f",
122
+ "@lodestar/config": "1.17.0-dev.4857f4354f",
123
+ "@lodestar/db": "1.17.0-dev.4857f4354f",
124
+ "@lodestar/fork-choice": "1.17.0-dev.4857f4354f",
125
+ "@lodestar/light-client": "1.17.0-dev.4857f4354f",
126
+ "@lodestar/logger": "1.17.0-dev.4857f4354f",
127
+ "@lodestar/params": "1.17.0-dev.4857f4354f",
128
+ "@lodestar/reqresp": "1.17.0-dev.4857f4354f",
129
+ "@lodestar/state-transition": "1.17.0-dev.4857f4354f",
130
+ "@lodestar/types": "1.17.0-dev.4857f4354f",
131
+ "@lodestar/utils": "1.17.0-dev.4857f4354f",
132
+ "@lodestar/validator": "1.17.0-dev.4857f4354f",
133
133
  "@multiformats/multiaddr": "^12.1.3",
134
134
  "c-kzg": "^2.1.2",
135
135
  "datastore-core": "^9.1.1",
@@ -141,7 +141,6 @@
141
141
  "it-pipe": "^3.0.1",
142
142
  "jwt-simple": "0.5.6",
143
143
  "libp2p": "1.1.1",
144
- "lodash": "^4.17.21",
145
144
  "multiformats": "^11.0.1",
146
145
  "prom-client": "^15.1.0",
147
146
  "qs": "^6.11.1",
@@ -154,7 +153,6 @@
154
153
  "devDependencies": {
155
154
  "@types/datastore-level": "^3.0.0",
156
155
  "@types/leveldown": "^4.0.3",
157
- "@types/lodash": "^4.14.192",
158
156
  "@types/qs": "^6.9.7",
159
157
  "@types/tmp": "^0.2.3",
160
158
  "it-drain": "^3.0.3",
@@ -170,5 +168,5 @@
170
168
  "beacon",
171
169
  "blockchain"
172
170
  ],
173
- "gitHead": "3d0680d9902d0437de2daab908701a93502eaf63"
171
+ "gitHead": "0854c32d1c9edc7a0acb9500cabb578bd7cfe0e4"
174
172
  }