@lodestar/beacon-node 1.38.0-dev.a8c0c7a156 → 1.38.0-dev.ebc352f211

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 (162) hide show
  1. package/README.md +1 -1
  2. package/lib/api/impl/beacon/state/index.d.ts.map +1 -1
  3. package/lib/api/impl/beacon/state/index.js +4 -5
  4. package/lib/api/impl/beacon/state/index.js.map +1 -1
  5. package/lib/api/impl/beacon/state/utils.d.ts.map +1 -1
  6. package/lib/api/impl/beacon/state/utils.js +5 -3
  7. package/lib/api/impl/beacon/state/utils.js.map +1 -1
  8. package/lib/api/impl/validator/index.js +1 -1
  9. package/lib/api/impl/validator/index.js.map +1 -1
  10. package/lib/chain/blocks/importBlock.d.ts.map +1 -1
  11. package/lib/chain/blocks/importBlock.js +4 -4
  12. package/lib/chain/blocks/importBlock.js.map +1 -1
  13. package/lib/chain/blocks/index.d.ts.map +1 -1
  14. package/lib/chain/blocks/index.js +2 -1
  15. package/lib/chain/blocks/index.js.map +1 -1
  16. package/lib/chain/blocks/types.d.ts +5 -1
  17. package/lib/chain/blocks/types.d.ts.map +1 -1
  18. package/lib/chain/blocks/verifyBlock.d.ts +2 -0
  19. package/lib/chain/blocks/verifyBlock.d.ts.map +1 -1
  20. package/lib/chain/blocks/verifyBlock.js +17 -29
  21. package/lib/chain/blocks/verifyBlock.js.map +1 -1
  22. package/lib/chain/blocks/verifyBlocksExecutionPayloads.d.ts +1 -6
  23. package/lib/chain/blocks/verifyBlocksExecutionPayloads.d.ts.map +1 -1
  24. package/lib/chain/blocks/verifyBlocksExecutionPayloads.js +10 -131
  25. package/lib/chain/blocks/verifyBlocksExecutionPayloads.js.map +1 -1
  26. package/lib/chain/blocks/verifyBlocksSignatures.d.ts +3 -3
  27. package/lib/chain/blocks/verifyBlocksSignatures.d.ts.map +1 -1
  28. package/lib/chain/blocks/verifyBlocksSignatures.js +2 -2
  29. package/lib/chain/blocks/verifyBlocksSignatures.js.map +1 -1
  30. package/lib/chain/chain.d.ts.map +1 -1
  31. package/lib/chain/chain.js +4 -14
  32. package/lib/chain/chain.js.map +1 -1
  33. package/lib/chain/forkChoice/index.d.ts.map +1 -1
  34. package/lib/chain/forkChoice/index.js +3 -3
  35. package/lib/chain/forkChoice/index.js.map +1 -1
  36. package/lib/chain/opPools/aggregatedAttestationPool.d.ts.map +1 -1
  37. package/lib/chain/opPools/aggregatedAttestationPool.js +3 -1
  38. package/lib/chain/opPools/aggregatedAttestationPool.js.map +1 -1
  39. package/lib/chain/options.d.ts +0 -4
  40. package/lib/chain/options.d.ts.map +1 -1
  41. package/lib/chain/options.js +0 -2
  42. package/lib/chain/options.js.map +1 -1
  43. package/lib/chain/prepareNextSlot.js +1 -1
  44. package/lib/chain/prepareNextSlot.js.map +1 -1
  45. package/lib/chain/produceBlock/produceBlockBody.d.ts +2 -21
  46. package/lib/chain/produceBlock/produceBlockBody.d.ts.map +1 -1
  47. package/lib/chain/produceBlock/produceBlockBody.js +24 -87
  48. package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
  49. package/lib/chain/rewards/attestationsRewards.d.ts +3 -3
  50. package/lib/chain/rewards/attestationsRewards.d.ts.map +1 -1
  51. package/lib/chain/rewards/attestationsRewards.js +4 -4
  52. package/lib/chain/rewards/attestationsRewards.js.map +1 -1
  53. package/lib/chain/rewards/syncCommitteeRewards.d.ts +2 -2
  54. package/lib/chain/rewards/syncCommitteeRewards.d.ts.map +1 -1
  55. package/lib/chain/rewards/syncCommitteeRewards.js +1 -2
  56. package/lib/chain/rewards/syncCommitteeRewards.js.map +1 -1
  57. package/lib/chain/validation/attesterSlashing.js +2 -2
  58. package/lib/chain/validation/attesterSlashing.js.map +1 -1
  59. package/lib/chain/validation/blobSidecar.d.ts.map +1 -1
  60. package/lib/chain/validation/blobSidecar.js +2 -2
  61. package/lib/chain/validation/blobSidecar.js.map +1 -1
  62. package/lib/chain/validation/block.d.ts.map +1 -1
  63. package/lib/chain/validation/block.js +3 -3
  64. package/lib/chain/validation/block.js.map +1 -1
  65. package/lib/chain/validation/dataColumnSidecar.d.ts.map +1 -1
  66. package/lib/chain/validation/dataColumnSidecar.js +2 -2
  67. package/lib/chain/validation/dataColumnSidecar.js.map +1 -1
  68. package/lib/chain/validation/proposerSlashing.js +1 -1
  69. package/lib/chain/validation/proposerSlashing.js.map +1 -1
  70. package/lib/chain/validation/signatureSets/contributionAndProof.d.ts +2 -2
  71. package/lib/chain/validation/signatureSets/contributionAndProof.d.ts.map +1 -1
  72. package/lib/chain/validation/signatureSets/contributionAndProof.js +2 -3
  73. package/lib/chain/validation/signatureSets/contributionAndProof.js.map +1 -1
  74. package/lib/chain/validation/signatureSets/syncCommittee.d.ts +2 -2
  75. package/lib/chain/validation/signatureSets/syncCommittee.d.ts.map +1 -1
  76. package/lib/chain/validation/signatureSets/syncCommittee.js +2 -2
  77. package/lib/chain/validation/signatureSets/syncCommittee.js.map +1 -1
  78. package/lib/chain/validation/signatureSets/syncCommitteeSelectionProof.d.ts +2 -2
  79. package/lib/chain/validation/signatureSets/syncCommitteeSelectionProof.d.ts.map +1 -1
  80. package/lib/chain/validation/signatureSets/syncCommitteeSelectionProof.js +3 -3
  81. package/lib/chain/validation/signatureSets/syncCommitteeSelectionProof.js.map +1 -1
  82. package/lib/chain/validation/syncCommittee.js +1 -1
  83. package/lib/chain/validation/syncCommittee.js.map +1 -1
  84. package/lib/chain/validation/syncCommitteeContributionAndProof.d.ts.map +1 -1
  85. package/lib/chain/validation/syncCommitteeContributionAndProof.js +4 -3
  86. package/lib/chain/validation/syncCommitteeContributionAndProof.js.map +1 -1
  87. package/lib/chain/validation/voluntaryExit.js +1 -1
  88. package/lib/chain/validation/voluntaryExit.js.map +1 -1
  89. package/lib/eth1/index.d.ts +2 -17
  90. package/lib/eth1/index.d.ts.map +1 -1
  91. package/lib/eth1/index.js +0 -50
  92. package/lib/eth1/index.js.map +1 -1
  93. package/lib/eth1/interface.d.ts +1 -39
  94. package/lib/eth1/interface.d.ts.map +1 -1
  95. package/lib/execution/engine/http.d.ts +4 -12
  96. package/lib/execution/engine/http.d.ts.map +1 -1
  97. package/lib/execution/engine/http.js +4 -12
  98. package/lib/execution/engine/http.js.map +1 -1
  99. package/lib/execution/engine/mock.d.ts +2 -6
  100. package/lib/execution/engine/mock.d.ts.map +1 -1
  101. package/lib/execution/engine/mock.js +3 -14
  102. package/lib/execution/engine/mock.js.map +1 -1
  103. package/lib/metrics/metrics/lodestar.d.ts +0 -14
  104. package/lib/metrics/metrics/lodestar.d.ts.map +1 -1
  105. package/lib/metrics/metrics/lodestar.js +0 -44
  106. package/lib/metrics/metrics/lodestar.js.map +1 -1
  107. package/lib/network/gossip/encoding.d.ts.map +1 -1
  108. package/lib/network/gossip/encoding.js +17 -7
  109. package/lib/network/gossip/encoding.js.map +1 -1
  110. package/lib/node/notifier.d.ts.map +1 -1
  111. package/lib/node/notifier.js +6 -22
  112. package/lib/node/notifier.js.map +1 -1
  113. package/lib/sync/backfill/backfill.d.ts.map +1 -1
  114. package/lib/sync/backfill/backfill.js +4 -2
  115. package/lib/sync/backfill/backfill.js.map +1 -1
  116. package/lib/sync/backfill/verify.d.ts +2 -2
  117. package/lib/sync/backfill/verify.d.ts.map +1 -1
  118. package/lib/sync/backfill/verify.js +3 -3
  119. package/lib/sync/backfill/verify.js.map +1 -1
  120. package/package.json +15 -16
  121. package/src/api/impl/beacon/state/index.ts +4 -5
  122. package/src/api/impl/beacon/state/utils.ts +5 -3
  123. package/src/api/impl/validator/index.ts +1 -1
  124. package/src/chain/blocks/importBlock.ts +5 -4
  125. package/src/chain/blocks/index.ts +2 -1
  126. package/src/chain/blocks/types.ts +5 -1
  127. package/src/chain/blocks/verifyBlock.ts +34 -33
  128. package/src/chain/blocks/verifyBlocksExecutionPayloads.ts +11 -170
  129. package/src/chain/blocks/verifyBlocksSignatures.ts +5 -3
  130. package/src/chain/chain.ts +4 -15
  131. package/src/chain/forkChoice/index.ts +2 -3
  132. package/src/chain/opPools/aggregatedAttestationPool.ts +5 -1
  133. package/src/chain/options.ts +0 -6
  134. package/src/chain/prepareNextSlot.ts +1 -1
  135. package/src/chain/produceBlock/produceBlockBody.ts +25 -120
  136. package/src/chain/rewards/attestationsRewards.ts +6 -5
  137. package/src/chain/rewards/syncCommitteeRewards.ts +2 -2
  138. package/src/chain/validation/attesterSlashing.ts +2 -2
  139. package/src/chain/validation/blobSidecar.ts +10 -2
  140. package/src/chain/validation/block.ts +2 -3
  141. package/src/chain/validation/dataColumnSidecar.ts +6 -1
  142. package/src/chain/validation/proposerSlashing.ts +1 -1
  143. package/src/chain/validation/signatureSets/contributionAndProof.ts +3 -2
  144. package/src/chain/validation/signatureSets/syncCommittee.ts +3 -1
  145. package/src/chain/validation/signatureSets/syncCommitteeSelectionProof.ts +4 -2
  146. package/src/chain/validation/syncCommittee.ts +1 -1
  147. package/src/chain/validation/syncCommitteeContributionAndProof.ts +4 -5
  148. package/src/chain/validation/voluntaryExit.ts +1 -1
  149. package/src/eth1/index.ts +2 -65
  150. package/src/eth1/interface.ts +1 -45
  151. package/src/execution/engine/http.ts +4 -12
  152. package/src/execution/engine/mock.ts +3 -15
  153. package/src/metrics/metrics/lodestar.ts +0 -52
  154. package/src/network/gossip/encoding.ts +19 -7
  155. package/src/node/notifier.ts +7 -29
  156. package/src/sync/backfill/backfill.ts +9 -2
  157. package/src/sync/backfill/verify.ts +8 -2
  158. package/lib/eth1/eth1MergeBlockTracker.d.ts +0 -65
  159. package/lib/eth1/eth1MergeBlockTracker.d.ts.map +0 -1
  160. package/lib/eth1/eth1MergeBlockTracker.js +0 -262
  161. package/lib/eth1/eth1MergeBlockTracker.js.map +0 -1
  162. package/src/eth1/eth1MergeBlockTracker.ts +0 -328
package/lib/network/gossip/encoding.js CHANGED
@@ -1,7 +1,7 @@
1
1
  // snappyjs is better for compression for smaller payloads
2
- import { compress, uncompress } from "snappyjs";
3
2
  import xxhashFactory from "xxhash-wasm";
4
3
  import { digest } from "@chainsafe/as-sha256";
4
+ import snappyWasm from "@chainsafe/snappy-wasm";
5
5
  import { ForkName } from "@lodestar/params";
6
6
  import { intToBytes } from "@lodestar/utils";
7
7
  import { MESSAGE_DOMAIN_VALID_SNAPPY } from "./constants.js";
@@ -10,6 +10,9 @@ import { getGossipSSZType } from "./topic.js";
10
10
  const xxhash = await xxhashFactory();
11
11
  // Use salt to prevent msgId from being mined for collisions
12
12
  const h64Seed = BigInt(Math.floor(Math.random() * 1e9));
13
+ // create singleton snappy encoder + decoder
14
+ const encoder = new snappyWasm.Encoder();
15
+ const decoder = new snappyWasm.Decoder();
13
16
  // Shared buffer to convert msgId to string
14
17
  const sharedMsgIdBuf = Buffer.alloc(20);
15
18
  /**
@@ -71,10 +74,11 @@ export class DataTransformSnappy {
71
74
  * - `outboundTransform()`: compress snappy payload
72
75
  */
73
76
  inboundTransform(topicStr, data) {
74
- const uncompressedData = uncompress(data, this.maxSizePerMessage);
75
- // check uncompressed data length before we extract beacon block root, slot or
76
- // attestation data at later steps
77
- const uncompressedDataLength = uncompressedData.length;
77
+ // check uncompressed data length before we actually decompress
78
+ const uncompressedDataLength = snappyWasm.decompress_len(data);
79
+ if (uncompressedDataLength > this.maxSizePerMessage) {
80
+ throw Error(`ssz_snappy decoded data length ${uncompressedDataLength} > ${this.maxSizePerMessage}`);
81
+ }
78
82
  const topic = this.gossipTopicCache.getTopic(topicStr);
79
83
  const sszType = getGossipSSZType(topic);
80
84
  this.metrics?.dataTransform.inbound.inc({ type: topic.type });
@@ -84,6 +88,10 @@ export class DataTransformSnappy {
84
88
  if (uncompressedDataLength > sszType.maxSize) {
85
89
  throw Error(`ssz_snappy decoded data length ${uncompressedDataLength} > ${sszType.maxSize}`);
86
90
  }
91
+ // Only after sanity length checks, we can decompress the data
92
+ // Using Buffer.alloc() instead of Buffer.allocUnsafe() to mitigate high GC pressure observed in some environments
93
+ const uncompressedData = Buffer.alloc(uncompressedDataLength);
94
+ decoder.decompress_into(data, uncompressedData);
87
95
  return uncompressedData;
88
96
  }
89
97
  /**
@@ -96,8 +104,10 @@ export class DataTransformSnappy {
96
104
  if (data.length > this.maxSizePerMessage) {
97
105
  throw Error(`ssz_snappy encoded data length ${data.length} > ${this.maxSizePerMessage}`);
98
106
  }
99
- // No need to parse topic, everything is snappy compressed
100
- return compress(data);
107
+ // Using Buffer.alloc() instead of Buffer.allocUnsafe() to mitigate high GC pressure observed in some environments
108
+ const compressedData = Buffer.alloc(snappyWasm.max_compress_len(data.length));
109
+ const compressedLen = encoder.compress_into(data, compressedData);
110
+ return compressedData.subarray(0, compressedLen);
101
111
  }
102
112
  }
103
113
  //# sourceMappingURL=encoding.js.map
package/lib/network/gossip/encoding.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"encoding.js","sourceRoot":"","sources":["../../../src/network/gossip/encoding.ts"],"names":[],"mappings":"AACA,0DAA0D;AAC1D,OAAO,EAAC,QAAQ,EAAE,UAAU,EAAC,MAAM,UAAU,CAAC;AAC9C,OAAO,aAAa,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,MAAM,EAAC,MAAM,sBAAsB,CAAC;AAG5C,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAC,2BAA2B,EAAC,MAAM,gBAAgB,CAAC;AAE3D,OAAO,EAAmB,gBAAgB,EAAC,MAAM,YAAY,CAAC;AAE9D,YAAY;AACZ,MAAM,MAAM,GAAG,MAAM,aAAa,EAAE,CAAC;AAErC,4DAA4D;AAC5D,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;AAExD,2CAA2C;AAC3C,MAAM,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;AAExC;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAC,MAAmB;IAC7C,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAChB,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC1D,CAAC;IACD,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,KAAiB;IAC5C,mEAAmE;IACnE,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC1B,OAAO,KAAK,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;AAC/C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,OAAO,CAAC,gBAAkC,EAAE,GAAY;IACtE,MAAM,KAAK,GAAG,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAEnD,IAAI,GAAiB,CAAC;IAEtB,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,KAAK,QAAQ,CAAC,MAAM,EAAE,CAAC;QAC5C,yBAAyB;QACzB,MAAM;QACN,6EAA6E;QAC7E,MAAM;QACN,GAAG,GAAG,CAAC,2BAA2B,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC;SAAM,CAAC;QACN,qDAAqD;QACrD,MAAM;QACN,UAAU;QACV,kCAAkC;QAClC,gDAAgD;QAChD,oBAAoB;QACpB,oCAAoC;QACpC,SAAS;QACT,MAAM;QACN,iHAAiH;QACjH,GAAG,GAAG,CAAC,2BAA2B,EAAE,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;IACzG,CAAC;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,OAAO,mBAAmB;IAEX;IACA;IACA;IAHnB,YACmB,gBAAkC,EAClC,iBAAyB,EACzB,OAAoC;QAFpC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,sBAAiB,GAAjB,iBAAiB,CAAQ;QACzB,YAAO,GAAP,OAAO,CAA6B;IACpD,CAAC;IAEJ;;;;;OAKG;IACH,gBAAgB,CAAC,QAAgB,EAAE,IAAgB;QACjD,MAAM,gBAAgB,GAAG,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAElE,8EAA8E;QAC9E,kCAAkC;QAClC,MAAM,sBAAsB,GAAG,gBAAgB,CAAC,MAAM,CAAC;QACvD,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,EAAC,IAAI,EAAE,KAAK,CAAC,IAAI,EAAC,CAAC,CAAC;QAE5D,IAAI,sBAAsB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;YAC7C,MAAM,KAAK,CAAC,kCAAkC,sBAAsB,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAC/F,CAAC;QACD,IAAI,sBAAsB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;YAC7C,MAAM,KAAK,CAAC,kCAAkC,sBAAsB,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAC/F,CAAC;QAED,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED;;;OAGG;IACH,iBAAiB,CAAC,QAAgB,EAAE,IAAgB;QAClD,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACvD,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAC,IAAI,EAAE,KAAK,CAAC,IAAI,EAAC,CAAC,CAAC;QAC7D,IAAI,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACzC,MAAM,KAAK,CAAC,kCAAkC,IAAI,CAAC,MAAM,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAC3F,CAAC;QACD,0DAA0D;QAC1D,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;CACF"}
1
+ {"version":3,"file":"encoding.js","sourceRoot":"","sources":["../../../src/network/gossip/encoding.ts"],"names":[],"mappings":"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"}
package/lib/node/notifier.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"notifier.d.ts","sourceRoot":"","sources":["../../src/node/notifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAW9C,OAAO,EAAe,MAAM,EAAuC,MAAM,iBAAiB,CAAC;AAC3F,OAAO,EAAC,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAE/C,OAAO,EAAC,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAC,WAAW,EAAY,MAAM,kBAAkB,CAAC;AAOxD,KAAK,mBAAmB,GAAG;IACzB,OAAO,EAAE,QAAQ,CAAC;IAClB,KAAK,EAAE,YAAY,CAAC;IACpB,IAAI,EAAE,WAAW,CAAC;IAClB,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,WAAW,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CA0HjF"}
1
+ {"version":3,"file":"notifier.d.ts","sourceRoot":"","sources":["../../src/node/notifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAU9C,OAAO,EAAe,MAAM,EAAuC,MAAM,iBAAiB,CAAC;AAC3F,OAAO,EAAC,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAE/C,OAAO,EAAC,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAC,WAAW,EAAY,MAAM,kBAAkB,CAAC;AAOxD,KAAK,mBAAmB,GAAG;IACzB,OAAO,EAAE,QAAQ,CAAC;IAClB,KAAK,EAAE,YAAY,CAAC;IACpB,IAAI,EAAE,WAAW,CAAC;IAClB,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,WAAW,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CA0GjF"}
package/lib/node/notifier.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { ExecutionStatus } from "@lodestar/fork-choice";
2
2
  import { EPOCHS_PER_SYNC_COMMITTEE_PERIOD, SLOTS_PER_EPOCH } from "@lodestar/params";
3
- import { computeEpochAtSlot, computeStartSlotAtEpoch, isExecutionCachedStateType, isMergeTransitionComplete, } from "@lodestar/state-transition";
3
+ import { computeEpochAtSlot, computeStartSlotAtEpoch, isExecutionCachedStateType, } from "@lodestar/state-transition";
4
4
  import { ErrorAborted, prettyBytes, prettyBytesShort, sleep } from "@lodestar/utils";
5
5
  import { ExecutionEngineState } from "../execution/index.js";
6
6
  import { SyncState } from "../sync/index.js";
@@ -14,7 +14,6 @@ const WARN_PEER_COUNT = 1;
14
14
  export async function runNodeNotifier(modules) {
15
15
  const { network, chain, sync, config, logger, signal } = modules;
16
16
  const headSlotTimeSeries = new TimeSeries({ maxPoints: 10 });
17
- const tdTimeSeries = new TimeSeries({ maxPoints: 50 });
18
17
  const SLOTS_PER_SYNC_COMMITTEE_PERIOD = SLOTS_PER_EPOCH * EPOCHS_PER_SYNC_COMMITTEE_PERIOD;
19
18
  let hasLowPeerCount = false;
20
19
  let isFirstTime = true;
@@ -56,18 +55,6 @@ export async function runNodeNotifier(modules) {
56
55
  const headRow = `head: ${headDiffInfo}${prettyBytes(headInfo.blockRoot)}`;
57
56
  const executionInfo = getHeadExecutionInfo(config, clockEpoch, headState, headInfo);
58
57
  const finalizedCheckpointRow = `finalized: ${prettyBytes(finalizedRoot)}:${finalizedEpoch}`;
59
- // Log in TD progress in separate line to not clutter regular status update.
60
- // This line will only exist between BELLATRIX_FORK_EPOCH and TTD, a window of some days / weeks max.
61
- // Notifier log lines must be kept at a reasonable max width otherwise it's very hard to read
62
- const tdProgress = chain.eth1.getTDProgress();
63
- if (tdProgress !== null && !tdProgress.ttdHit) {
64
- tdTimeSeries.addPoint(tdProgress.tdDiffScaled, tdProgress.timestamp);
65
- const timestampTDD = tdTimeSeries.computeY0Point();
66
- // It is possible to get ttd estimate with an error at imminent merge
67
- const secToTTD = Math.max(Math.floor(timestampTDD - Date.now() / 1000), 0);
68
- const timeLeft = Number.isFinite(secToTTD) ? prettyTimeDiffSec(secToTTD) : "?";
69
- logger.info(`TTD in ${timeLeft} current TD ${tdProgress.td} / ${tdProgress.ttd}`);
70
- }
71
58
  let nodeState;
72
59
  switch (sync.state) {
73
60
  case SyncState.SyncingFinalized:
@@ -141,14 +128,11 @@ function getHeadExecutionInfo(config, clockEpoch, headState, headInfo) {
141
128
  const executionStatusStr = headInfo.executionStatus.toLowerCase();
142
129
  // Add execution status to notifier only if head is on/post bellatrix
143
130
  if (isExecutionCachedStateType(headState)) {
144
- if (isMergeTransitionComplete(headState)) {
145
- const executionPayloadHashInfo = headInfo.executionStatus !== ExecutionStatus.PreMerge ? headInfo.executionPayloadBlockHash : "empty";
146
- const executionPayloadNumberInfo = headInfo.executionStatus !== ExecutionStatus.PreMerge ? headInfo.executionPayloadNumber : NaN;
147
- return [
148
- `exec-block: ${executionStatusStr}(${executionPayloadNumberInfo} ${prettyBytesShort(executionPayloadHashInfo)})`,
149
- ];
150
- }
151
- return [`exec-block: ${executionStatusStr}`];
131
+ const executionPayloadHashInfo = headInfo.executionStatus !== ExecutionStatus.PreMerge ? headInfo.executionPayloadBlockHash : "empty";
132
+ const executionPayloadNumberInfo = headInfo.executionStatus !== ExecutionStatus.PreMerge ? headInfo.executionPayloadNumber : NaN;
133
+ return [
134
+ `exec-block: ${executionStatusStr}(${executionPayloadNumberInfo} ${prettyBytesShort(executionPayloadHashInfo)})`,
135
+ ];
152
136
  }
153
137
  return [];
154
138
  }
package/lib/node/notifier.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"notifier.js","sourceRoot":"","sources":["../../src/node/notifier.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"notifier.js","sourceRoot":"","sources":["../../src/node/notifier.ts"],"names":[],"mappings":"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"}
package/lib/sync/backfill/backfill.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"backfill.d.ts","sourceRoot":"","sources":["../../../src/sync/backfill/backfill.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"backfill.d.ts","sourceRoot":"","sources":["../../../src/sync/backfill/backfill.ts"],"names":[],"mappings":"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"}
package/lib/sync/backfill/backfill.js CHANGED
@@ -548,7 +548,9 @@ export class BackfillSync extends EventEmitter {
548
548
  // GENESIS_SLOT doesn't has valid signature
549
549
  if (anchorBlock.message.slot === GENESIS_SLOT)
550
550
  return;
551
- await verifyBlockProposerSignature(this.chain.bls, this.chain.getHeadState(), [anchorBlock]);
551
+ await verifyBlockProposerSignature(this.chain.index2pubkey, this.chain.bls, this.chain.getHeadState(), [
552
+ anchorBlock,
553
+ ]);
552
554
  // We can write to the disk if this is ahead of prevFinalizedCheckpointBlock otherwise
553
555
  // we will need to go make checks on the top of sync loop before writing as it might
554
556
  // override prevFinalizedCheckpointBlock
@@ -599,7 +601,7 @@ export class BackfillSync extends EventEmitter {
599
601
  const { nextAnchor, verifiedBlocks, error } = verifyBlockSequence(this.config, blocks, anchorParentRoot);
600
602
  // If any of the block's proposer signature fail, we can't trust this peer at all
601
603
  if (verifiedBlocks.length > 0) {
602
- await verifyBlockProposerSignature(this.chain.bls, this.chain.getHeadState(), verifiedBlocks);
604
+ await verifyBlockProposerSignature(this.chain.index2pubkey, this.chain.bls, this.chain.getHeadState(), verifiedBlocks);
603
605
  // This is bad, like super bad. Abort the backfill
604
606
  if (!nextAnchor)
605
607
  throw new BackfillSyncError({
package/lib/sync/backfill/backfill.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"backfill.js","sourceRoot":"","sources":["../../../src/sync/backfill/backfill.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAsB,aAAa,EAAE,uBAAuB,EAAC,MAAM,4BAA4B,CAAC;AACvG,OAAO,EAAwC,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAC,YAAY,EAAU,KAAK,EAAE,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAEvE,OAAO,EAAC,YAAY,EAAE,SAAS,EAAC,MAAM,0BAA0B,CAAC;AAGjE,OAAO,EAAW,YAAY,EAAoB,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAC5F,OAAO,EAAC,eAAe,EAAC,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAC,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAElD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAC,iBAAiB,EAAE,qBAAqB,EAAC,MAAM,aAAa,CAAC;AACrE,OAAO,EAAqC,4BAA4B,EAAE,mBAAmB,EAAC,MAAM,aAAa,CAAC;AAElH;;;GAGG;AACH,MAAM,wBAAwB,GAAG,IAAI,CAAC;AA0BtC,MAAM,CAAN,IAAY,iBAEX;AAFD,WAAY,iBAAiB;IAC3B,yDAAoC,CAAA;AACtC,CAAC,EAFW,iBAAiB,KAAjB,iBAAiB,QAE5B;AAED,MAAM,CAAN,IAAY,kBAKX;AALD,WAAY,kBAAkB;IAC5B,2CAAqB,CAAA;IACrB,6DAAuC,CAAA;IACvC,6CAAuB,CAAA;IACvB,iDAA2B,CAAA;AAC7B,CAAC,EALW,kBAAkB,KAAlB,kBAAkB,QAK7B;AAED,MAAM,CAAN,IAAY,kBAKX;AALD,WAAY,kBAAkB;IAC5B,yCAAmB,CAAA;IACnB,yCAAmB,CAAA;IACnB,6CAAuB,CAAA;IACvB,yCAAmB,CAAA;AACrB,CAAC,EALW,kBAAkB,KAAlB,kBAAkB,QAK7B;AAED,6DAA6D;AAC7D,MAAM,UAAU,GAAwC;IACtD,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,CAAC;IAC/B,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,CAAC;IAC/B,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,CAAC;IAC/B,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE,CAAC;CAClC,CAAC;AA6BF,MAAM,OAAO,YAAa,SAAS,YAA8C;IAC/E,6CAA6C;IAC7C,UAAU,CAAqB;IAEd,KAAK,CAAe;IACpB,OAAO,CAAW;IAClB,EAAE,CAAY;IACd,MAAM,CAAe;IACrB,MAAM,CAAS;IACf,OAAO,CAAiB;IAEzC;;OAEG;IACK,IAAI,CAAmB;IAC/B;;;;;;;;OAQG;IACK,kBAAkB,CAA6B;IAC/C,WAAW,GAAG,KAAK,CAAC;IAE5B;;;;;;;;;;;;;;OAcG;IACK,4BAA4B,CAAsB;IAC1D,6EAA6E;IACrE,qBAAqB,CAAO;IAC5B,wBAAwB,CAAc;IAEtC,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC;IAC5B,KAAK,GAAG,IAAI,GAAG,EAAa,CAAC;IAC7B,MAAM,GAAuB,kBAAkB,CAAC,OAAO,CAAC;IACxD,MAAM,CAAc;IAE5B,YAAY,IAAsB,EAAE,OAAwB;QAC1D,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QACrC,IAAI,CAAC,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,CAAC;QAC3D,IAAI,CAAC,wBAAwB,GAAG,OAAO,CAAC,wBAAwB,CAAC;QACjE,IAAI,CAAC,4BAA4B,GAAG,OAAO,CAAC,4BAA4B,CAAC;QACzE,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;QAErD,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAE/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACjE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,gBAAgB,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACvE,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAE7B,IAAI,CAAC,IAAI,EAAE;aACR,IAAI,CAAC,CAAC,gBAAgB,EAAE,EAAE;YACzB,IAAI,IAAI,CAAC,MAAM,KAAK,kBAAkB,CAAC,SAAS,EAAE,CAAC;gBACjD,MAAM,IAAI,YAAY,CAAC,oEAAoE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;YAC5G,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;YACzD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,EAAC,gBAAgB,EAAC,CAAC,CAAC;YAC/D,2EAA2E;YAC3E,8DAA8D;YAC9D,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,CAAC,CAAC,CAAC;YACrD,IAAI,CAAC,MAAM,GAAG,kBAAkB,CAAC,OAAO,CAAC;YACzC,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;QAEL,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACvG,OAAO,CAAC,YAAY,CAAC,kBAAkB,CAAC,UAAU,CAAC,GAAG,EAAE,CACtD,OAAO,CAAC,YAAY,CAAC,kBAAkB,CAAC,GAAG,CACzC,IAAI,CAAC,UAAU,CAAC,mBAAmB,EAAE,IAAI,IAAI,IAAI,CAAC,qBAAqB,CACxE,CACF,CAAC;YACF,OAAO,CAAC,YAAY,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,EAAE,CACnD,OAAO,CAAC,YAAY,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CACzG,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,MAAM,CAAC,KAAK,CAAC,IAAI,CACf,IAAsB,EACtB,OAA4B;QAE5B,MAAM,EAAC,MAAM,EAAE,WAAW,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAC,GAAG,OAAO,CAAC;QAEhE,MAAM,EAAC,UAAU,EAAE,QAAQ,EAAC,GAAG,uBAAuB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAC5E,MAAM,UAAU,GAAG,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC;QACtD,MAAM,UAAU,GAAG;YACjB,WAAW,EAAE,IAAI;YACjB,eAAe,EAAE,QAAQ,CAAC,IAAI;YAC9B,UAAU;YACV,mBAAmB,EAAE,IAAI;SAC1B,CAAC;QAEF,uEAAuE;QACvE,sBAAsB;QACtB,MAAM,qBAAqB,GAAG,UAAU,CAAC;QACzC,MAAM,wBAAwB,GAAG,MAAM,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;QACtF,MAAM,wBAAwB,GAAG,MAAM,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC;YACjE,GAAG,EAAE,qBAAqB;SAC3B,CAAC,CAAC;QACH,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE;YAClD,IAAI,EAAE,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC;YAC9B,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,qBAAqB;YACrB,wBAAwB,EAAE,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC;SACnE,CAAC,CAAC;QAEH,uEAAuE;QACvE,MAAM,kBAAkB,GAA+B,YAAY;YACjE,CAAC,CAAC,EAAC,IAAI,EAAE,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,CAAC,KAAK,GAAG,eAAe,EAAC;YACvE,CAAC,CAAC,IAAI,CAAC;QACT,0EAA0E;QAC1E,MAAM,4BAA4B,GAAG,MAAM,gCAAgC,CAAC,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;QAE5G,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE;YAC5B,UAAU;YACV,qBAAqB;YACrB,wBAAwB;YACxB,kBAAkB;YAClB,4BAA4B;YAC5B,GAAG,OAAO;SACX,CAAM,CAAC;IACV,CAAC;IAED,yCAAyC;IACzC,KAAK;QACH,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAClE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,gBAAgB,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACxE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC;IACvD,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,IAAI;QAChB,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;QAEzB,IAAI,KAAK,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACrC,IAAI,IAAI,CAAC,MAAM,KAAK,kBAAkB,CAAC,OAAO,EAAE,CAAC;gBAC/C,6CAA6C;gBAC7C,MAAM;YACR,CAAC;YACD,IAAI,CAAC,MAAM,GAAG,kBAAkB,CAAC,OAAO,CAAC;YAEzC,+EAA+E;YAC/E,8CAA8C;YAC9C,wEAAwE;YACxE,iFAAiF;YACjF,wEAAwE;YACxE,2BAA2B;YAC3B,8CAA8C;YAC9C,EAAE;YACF,oFAAoF;YACpF,uCAAuC;YACvC,8EAA8E;YAC9E,yCAAyC;YACzC,wFAAwF;YACxF,8EAA8E;YAC9E,qFAAqF;YACrF,uEAAuE;YACvE,mCAAmC;YACnC,wEAAwE;YACxE,sFAAsF;YACtF,gFAAgF;YAChF,kBAAkB;YAClB,uFAAuF;YACvF,eAAe;YACf,IAAI,IAAI,CAAC,UAAU,CAAC,mBAAmB,IAAI,IAAI,EAAE,CAAC;gBAChD,kCAAkC;gBAClC,iEAAiE;gBACjE,kFAAkF;gBAClF,+DAA+D;gBAC/D,gEAAgE;gBAChE,IAAI,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,GAAG,IAAI,CAAC,4BAA4B,CAAC,IAAI,EAAE,CAAC;oBACtF,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,mBACE,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IACtC,qEAAqE,SAAS,CAC5E,IAAI,CAAC,4BAA4B,CAAC,IAAI,CACvC,UAAU,IAAI,CAAC,4BAA4B,CAAC,IAAI,EAAE,CACpD,CAAC;oBACF,kCAAkC;oBAClC,MAAM;gBACR,CAAC;gBAED,IAAI,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,KAAK,IAAI,CAAC,4BAA4B,CAAC,IAAI,EAAE,CAAC;oBACxF,qEAAqE;oBACrE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,EAAE,CAAC;wBACvG,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,qEACE,IAAI,CAAC,4BAA4B,CAAC,IACpC,cAAc,SAAS,CAAC,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,YAAY,SAAS,CAClF,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,CACzC,EAAE,CACJ,CAAC;wBACF,kCAAkC;wBAClC,MAAM;oBACR,CAAC;oBACD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,gDAAgD,EAAE;wBACpE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC;wBACvD,IAAI,EAAE,IAAI,CAAC,4BAA4B,CAAC,IAAI;qBAC7C,CAAC,CAAC;oBAEH,+EAA+E;oBAC/E,mFAAmF;oBACnF,qCAAqC;oBACrC,EAAE;oBACF,yEAAyE;oBACzE,uEAAuE;oBACvE,mBAAmB;oBACnB,6EAA6E;oBAC7E,0BAA0B;oBAC1B,IAAI,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;wBAC9D,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,CAC5B,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,EACxC,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,KAAK,CAC1C,CAAC;oBACJ,CAAC;oBACD,IAAI,CAAC,4BAA4B,GAAG,MAAM,gCAAgC,CACxE,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,EACxC,IAAI,CAAC,MAAM,CACZ,CAAC;gBACJ,CAAC;gBAED,IAAI,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;oBAC9D,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,EAAE,CAAC;wBAC9F,KAAK,CACH,iDAAiD,SAAS,CACxD,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAC7D,EAAE,CACJ,CAAC;oBACJ,CAAC;oBACD,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;gBAC1F,CAAC;gBAED,IAAI,IAAI,CAAC,kBAAkB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjD,MAAM,IAAI,CAAC,kCAAkC,EAAE,CAAC;gBAClD,CAAC;gBAED,IACE,IAAI,CAAC,wBAAwB,KAAK,IAAI;oBACtC,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,GAAG,IAAI,CAAC,wBAAwB,EACxE,CAAC;oBACD,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,CAAC;oBACzE,MAAM,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,qBAAqB,EAAE,IAAI,CAAC,wBAAwB,CAAC,CAAC;oBAC9F,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,mCAAmC,IAAI,CAAC,qBAAqB,SAAS,IAAI,CAAC,wBAAwB,EAAE,CACtG,CAAC;gBACJ,CAAC;gBAED,IAAI,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;oBAC9D,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,iCAAiC,CAAC,CAAC;oBACvD,IAAI,CAAC,MAAM,GAAG,kBAAkB,CAAC,SAAS,CAAC;oBAC3C,OAAO,YAAY,CAAC;gBACtB,CAAC;gBAED,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gCAAgC,EAAE,CAAC;gBACpE,IAAI,aAAa,EAAE,CAAC;oBAClB,oCAAoC;oBACpC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;oBACzB,SAAS;gBACX,CAAC;YACH,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;gBAChD,IAAI,WAAW,EAAE,CAAC;oBAChB,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;oBACzB,SAAS;gBACX,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,EAAE,EAAE,CAAU,CAAC,CAAC;gBACjE,kCAAkC;gBAClC,MAAM;YACR,CAAC;YAED,yCAAyC;YACzC,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YACzD,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,IAAI,CAAC,MAAM,GAAG,kBAAkB,CAAC,OAAO,CAAC;gBACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;gBAClC,SAAS;YACX,CAAC;YAED,IAAI,CAAC;gBACH,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;oBACjC,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;oBAElE,gEAAgE;oBAChE,sCAAsC;gBACxC,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;oBAE3B,6EAA6E;oBAC7E,sCAAsC;gBACxC,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;gBACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,EAAE,CAAU,CAAC,CAAC;gBAEhD,IAAI,CAAC,YAAY,iBAAiB,EAAE,CAAC;oBACnC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;wBACpB,KAAK,qBAAqB,CAAC,cAAc;4BACvC,2CAA2C;4BAC3C,IAAI,CAAC,MAAM,GAAG,kBAAkB,CAAC,OAAO,CAAC;4BACzC,MAAM;wBACR,KAAK,qBAAqB,CAAC,YAAY,CAAC;wBACxC,6FAA6F;wBAC7F,KAAK,qBAAqB,CAAC,UAAU;4BACnC,0EAA0E;4BAC1E,+CAA+C;4BAC/C,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;gCAChC,IAAI,CAAC,UAAU,GAAG;oCAChB,WAAW,EAAE,IAAI;oCACjB,eAAe,EAAE,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU;oCAC/D,UAAU,EAAE,IAAI;oCAChB,mBAAmB,EAAE,IAAI,CAAC,UAAU,CAAC,mBAAmB;iCACzD,CAAC;4BACJ,CAAC;wBAEH,gBAAgB;wBAChB,KAAK,qBAAqB,CAAC,iBAAiB;4BAC1C,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;oBACjF,CAAC;gBACH,CAAC;YACH,CAAC;oBAAS,CAAC;gBACT,IAAI,IAAI,CAAC,MAAM,KAAK,kBAAkB,CAAC,OAAO;oBAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;YAC3E,CAAC;QACH,CAAC;QAED,MAAM,IAAI,YAAY,CAAC,cAAc,CAAC,CAAC;IACzC,CAAC;IAEO,OAAO,GAAG,CAAC,IAAkD,EAAQ,EAAE;QAC7E,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,mBAAmB,EAAE,IAAI,IAAI,IAAI,CAAC,qBAAqB,CAAC;QAC7F,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,EAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,YAAY,EAAC,CAAC,CAAC;QAC9E,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,YAAY,EAAE,CAAC;YACzC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1B,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC;IACH,CAAC,CAAC;IAEM,UAAU,GAAG,CAAC,IAAqD,EAAQ,EAAE;QACnF,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC,CAAC;IAEF;;;OAGG;IACK,KAAK,CAAC,kCAAkC;QAC9C,IAAI,IAAI,CAAC,UAAU,CAAC,mBAAmB,IAAI,IAAI,EAAE,CAAC;YAChD,MAAM,KAAK,CAAC,uDAAuD,CAAC,CAAC;QACvE,CAAC;QACD,IAAI,IAAI,CAAC,kBAAkB,IAAI,IAAI,EAAE,CAAC;YACpC,MAAM,KAAK,CAAC,wCAAwC,CAAC,CAAC;QACxD,CAAC;QACD,IAAI,IAAI,CAAC,WAAW;YAAE,OAAO;QAE7B,IAAI,IAAI,CAAC,kBAAkB,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;YAC7E,oFAAoF;YACpF,8EAA8E;YAC9E,wDAAwD;YACxD,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;YAC/F,IACE,CAAC,mBAAmB;gBACpB,oFAAoF;gBACpF,2EAA2E;gBAC3E,8DAA8D;gBAE9D,8DAA8D;gBAC9D,4BAA4B;gBAC5B,mEAAmE;gBACnE,mBAAmB,CAAC,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,kBAAkB,CAAC,IAAI,GAAG,eAAe;gBAElF,yCAAyC;gBACzC,MAAM,IAAI,KAAK,CACb,4BAA4B,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,WACjE,IAAI,CAAC,kBAAkB,CAAC,IAAI,GAAG,eACjC,KACE,mBAAmB;oBACjB,CAAC,CAAC,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,IAAI,GAAG,eAAe,CAAC;oBACrF,CAAC,CAAC,WACN,EAAE,CACH,CAAC;YACJ,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE;gBAC1C,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC;gBAC7C,KAAK,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,GAAG,eAAe;aACtD,CAAC,CAAC;YACH,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QAC1B,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,gCAAgC;QAC5C,IAAI,IAAI,CAAC,UAAU,CAAC,mBAAmB,KAAK,IAAI,EAAE,CAAC;YACjD,MAAM,KAAK,CAAC,4FAA4F,CAAC,CAAC;QAC5G,CAAC;QAED,IAAI,aAAa,GAAG,KAAK,CAAC;QAC1B,IAAI,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,KAAK,IAAI;YAAE,OAAO,aAAa,CAAC;QAC5E,MAAM,kBAAkB,GAAG,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,CAAC;QAEpE,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC;YAC1D,GAAG,EAAE,kBAAkB;SACxB,CAAC,CAAC;QAEH,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,EAAC,KAAK,EAAE,UAAU,EAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;YAEtF,IAAI,UAAU,GAAG,kBAAkB,EAAE,CAAC;gBACpC,aAAa,GAAG,IAAI,CAAC;gBACrB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAC/D,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,aAAa,GAAG,KAAK,CAAC;oBACtB,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,kDAAkD,UAAU,yCAAyC,CACtG,CAAC;gBACJ,CAAC;gBACD,IAAI,WAAW,IAAI,aAAa,IAAI,IAAI,CAAC,4BAA4B,CAAC,IAAI,IAAI,UAAU,EAAE,CAAC;oBACzF,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,kCAAkC,UAAU,gDAAgD,EAC5F,EAAC,IAAI,EAAE,IAAI,CAAC,4BAA4B,CAAC,IAAI,EAAC,CAC/C,CAAC;oBAEF,4EAA4E;oBAC5E,iEAAiE;oBACjE,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAC;oBACzG,IACE,mBAAmB,IAAI,IAAI;wBAC3B,IAAI,CAAC,4BAA4B,CAAC,IAAI,KAAK,mBAAmB,CAAC,OAAO,CAAC,IAAI,EAC3E,CAAC;wBACD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,gDAAgD,EAAE;4BACpE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC;4BACvD,IAAI,EAAE,mBAAmB,CAAC,OAAO,CAAC,IAAI;yBACvC,CAAC,CAAC;oBACL,CAAC;yBAAM,CAAC;wBACN,aAAa,GAAG,KAAK,CAAC;wBACtB,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,0EAA0E,SAAS,CACjF,IAAI,CAAC,4BAA4B,CAAC,IAAI,CACvC,UAAU,IAAI,CAAC,4BAA4B,CAAC,IAAI,IAC/C,mBAAmB,CAAC,CAAC,CAAC,gBAAgB,GAAG,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,WAC9E,yBAAyB,CAC1B,CAAC;oBACJ,CAAC;gBACH,CAAC;gBAED,IAAI,WAAW,IAAI,aAAa,EAAE,CAAC;oBACjC,iFAAiF;oBACjF,MAAM,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,qBAAqB,EAAE,UAAU,CAAC,CAAC;oBAC3E,IAAI,CAAC,wBAAwB,GAAG,UAAU,CAAC;oBAC3C,IAAI,CAAC,MAAM,CAAC,OAAO,CACjB,2CAA2C,IAAI,CAAC,qBAAqB,KAAK,IAAI,CAAC,wBAAwB,EAAE,EACzG,EAAC,UAAU,EAAC,CACb,CAAC;oBAEF,MAAM,iBAAiB,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;oBAC1E,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,iBAAiB,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;oBAErF,IAAI,CAAC,UAAU,GAAG;wBAChB,WAAW;wBACX,eAAe;wBACf,UAAU,EAAE,UAAU;wBACtB,mBAAmB,EAAE,EAAC,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,WAAW,EAAC;qBACnF,CAAC;oBACF,IAAI,IAAI,CAAC,4BAA4B,CAAC,IAAI,IAAI,UAAU,EAAE,CAAC;wBACzD,qEAAqE;wBACrE,iBAAiB;wBACjB,+DAA+D;wBAC/D,IAAI,CAAC,4BAA4B,GAAG,MAAM,gCAAgC,CACxE,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,EAAE,EACP,UAAU,EACV,IAAI,CAAC,MAAM,CACZ,CAAC;oBACJ,CAAC;oBAED,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,WAAW,CAAC,GAAG,CACxC,EAAC,MAAM,EAAE,kBAAkB,CAAC,iBAAiB,EAAC,EAC9C,kBAAkB,GAAG,UAAU,CAChC,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAED,mFAAmF;QACnF,6CAA6C;QAC7C,MAAM,WAAW,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAC3F,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;YAClF,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,wCAAwC,IAAI,CAAC,qBAAqB,IAAI,SAAS,CAC7E,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,CACzC,EAAE,EACH,EAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAC,CAC3C,CAAC;QACJ,CAAC;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;IAEO,KAAK,CAAC,cAAc;QAC1B,iFAAiF;QACjF,mDAAmD;QACnD,IAAI,eAAqB,CAAC;QAC1B,IAAI,YAAY,GAAgB,IAAI,CAAC;QACrC,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;YAChC,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC;QACnE,CAAC;aAAM,CAAC;YACN,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC;YAClD,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;QAC5C,CAAC;QACD,IAAI,WAAW,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QACxE,IAAI,CAAC,WAAW;YAAE,OAAO,KAAK,CAAC;QAE/B,IAAI,YAAY,KAAK,IAAI,IAAI,WAAW,CAAC,OAAO,CAAC,IAAI,KAAK,YAAY;YACpE,MAAM,KAAK,CACT,sDAAsD,SAAS,CAC7D,eAAe,CAChB,cAAc,YAAY,YAAY,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,CAClE,CAAC;QAEJ,8EAA8E;QAC9E,IAAI,WAAqC,EACvC,SAAS,GAAG,CAAC,CAAC;QAEhB,IAAI,gCAAgC,GAAG,KAAK,CAAC;QAC7C,OACE,SAAS,KAAK,IAAI,CAAC,IAAI,CAAC,iBAAiB;YACzC,8EAA8E;YAC9E,CAAC,WAAW,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EACpF,CAAC;YACD,iFAAiF;YACjF,IAAI,WAAW,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,4BAA4B,CAAC,IAAI,EAAE,CAAC;gBACtE,MAAM,KAAK,CACT,oDAAoD,SAAS,CAC3D,IAAI,CAAC,4BAA4B,CAAC,IAAI,CACvC,UAAU,SAAS,CAAC,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,EAAE,CAC/D,CAAC;YACJ,CAAC;YACD,IAAI,WAAW,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC,4BAA4B,CAAC,IAAI,EAAE,CAAC;gBACxE,IACE,CAAC,gCAAgC;oBACjC,CAAC,eAAe,CAAC,eAAe,EAAE,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,EACzE,CAAC;oBACD,MAAM,KAAK,CACT,yDACE,IAAI,CAAC,4BAA4B,CAAC,IACpC,cAAc,SAAS,CAAC,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,WAAW,SAAS,CAAC,eAAe,CAAC,EAAE,CACvG,CAAC;gBACJ,CAAC;gBAED,qEAAqE;gBACrE,kEAAkE;gBAClE,wDAAwD;gBACxD,+BAA+B;gBAC/B,IAAI,WAAW,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;oBAC9D,IAAI,CAAC,4BAA4B,GAAG,EAAC,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI,EAAC,CAAC;oBAC3G,gCAAgC,GAAG,IAAI,CAAC;gBAC1C,CAAC;qBAAM,CAAC;oBACN,6DAA6D;oBAC7D,IAAI,CAAC,4BAA4B,GAAG,MAAM,gCAAgC,CACxE,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,EAAE,EACP,WAAW,CAAC,OAAO,CAAC,IAAI,EACxB,IAAI,CAAC,MAAM,CACZ,CAAC;oBACF,gCAAgC,GAAG,KAAK,CAAC;gBAC3C,CAAC;YACH,CAAC;YACD,eAAe,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC;YACjD,WAAW,GAAG,WAAW,CAAC;YAC1B,SAAS,EAAE,CAAC;QACd,CAAC;QAED,IAAI,CAAC,UAAU,GAAG;YAChB,WAAW;YACX,eAAe;YACf,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI;YACpC,mBAAmB,EAAE,EAAC,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,EAAC;SACjG,CAAC;QACF,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,kBAAkB,CAAC,QAAQ,EAAC,EAAE,SAAS,CAAC,CAAC;QAC7F,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,SAAS,uBAAuB,EAAE;YAC5D,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI;SAC/B,CAAC,CAAC;QACH,IAAI,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC7C,qFAAqF;YACrF,6DAA6D;YAC7D,MAAM,KAAK,CAAC,wBAAwB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACrD,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,IAAe,EAAE,eAAqB;QAClE,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,IAAI,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;QAC/E,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAClE,MAAM,WAAW,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QAE3B,2CAA2C;QAC3C,IAAI,WAAW,CAAC,OAAO,CAAC,IAAI,KAAK,YAAY;YAAE,OAAO;QACtD,MAAM,4BAA4B,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;QAE7F,sFAAsF;QACtF,oFAAoF;QACpF,wCAAwC;QACxC,IAAI,IAAI,CAAC,4BAA4B,CAAC,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACtE,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAC/D,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAC7E,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YACxE,CAAC;QACH,CAAC;QAED,IAAI,CAAC,UAAU,GAAG;YAChB,WAAW,EAAE,WAAW;YACxB,eAAe;YACf,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI;YACpC,mBAAmB,EAAE,EAAC,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,EAAC;SACjG,CAAC;QAEF,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,kBAAkB,CAAC,WAAW,EAAC,CAAC,CAAC;QAErF,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,yBAAyB,EAAE;YAC7C,IAAI,EAAE,SAAS,CAAC,eAAe,CAAC;YAChC,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI;SAC/B,CAAC,CAAC;QAEH,OAAO;IACT,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,IAAe;QACrC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;YACjC,MAAM,KAAK,CAAC,wCAAwC,CAAC,CAAC;QACxD,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;QACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CACvB,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EACpC,IAAI,CAAC,4BAA4B,CAAC,IAAI,EACtC,YAAY,CACb,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,IAAI,EAAE;YAC9D,SAAS,EAAE,QAAQ;YACnB,KAAK,EAAE,MAAM,GAAG,QAAQ;YACxB,IAAI,EAAE,CAAC;SACR,CAAC,CAAC;QAEH,MAAM,gBAAgB,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC;QAExE,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,qDAAqD;YACrD,IAAI,CAAC,UAAU,GAAG;gBAChB,WAAW,EAAE,IAAI;gBACjB,eAAe,EAAE,gBAAgB;gBACjC,UAAU,EAAE,IAAI;gBAChB,mBAAmB,EAAE,IAAI,CAAC,UAAU,CAAC,mBAAmB;aACzD,CAAC;YACF,OAAO;QACT,CAAC;QAED,MAAM,EAAC,UAAU,EAAE,cAAc,EAAE,KAAK,EAAC,GAAG,mBAAmB,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC;QAEvG,iFAAiF;QACjF,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,MAAM,4BAA4B,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,cAAc,CAAC,CAAC;YAE9F,kDAAkD;YAClD,IAAI,CAAC,UAAU;gBACb,MAAM,IAAI,iBAAiB,CAAC;oBAC1B,IAAI,EAAE,qBAAqB,CAAC,cAAc;oBAC1C,MAAM,EAAE,oCAAoC;iBAC7C,CAAC,CAAC;YAEL,mFAAmF;YACnF,mFAAmF;YACnF,yDAAyD;YACzD,MAAM,WAAW,GACf,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,4BAA4B,CAAC,IAAI;gBACtD,CAAC,CAAC,cAAc;gBAChB,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAEzD,MAAM,UAAU,GAAG,EAAE,CAAC;YACtB,MAAM,aAAa,GAAG,EAAE,CAAC;YAEzB,KAAK,MAAM,KAAK,IAAI,WAAW,EAAE,CAAC;gBAChC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBACzD,MAAM,IAAI,GAAG;oBACX,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI;oBACvB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI;oBACxB,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC;oBAC/F,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,UAAU;iBACrC,CAAC;gBAEF,IAAI,UAAU,EAAE,CAAC;oBACf,UAAU,CAAC,IAAI,CAAC,EAAC,GAAG,IAAI,EAAE,KAAK,EAAE,UAAU,EAAC,CAAC,CAAC;gBAChD,CAAC;qBAAM,CAAC;oBACN,aAAa,CAAC,IAAI,CAAC,EAAC,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,EAAC,CAAC,CAAC;gBAC9C,CAAC;YACH,CAAC;YAED,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC1B,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;YACxD,CAAC;YACD,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7B,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;YACrD,CAAC;YAED,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,kBAAkB,CAAC,SAAS,EAAC,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;QAC5G,CAAC;QAED,4DAA4D;QAC5D,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;YACxB,IAAI,CAAC,UAAU,GAAG;gBAChB,WAAW,EAAE,UAAU,CAAC,KAAK;gBAC7B,eAAe,EAAE,UAAU,CAAC,IAAI;gBAChC,UAAU,EAAE,UAAU,CAAC,IAAI;gBAC3B,mBAAmB,EAAE,UAAU;aAChC,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,wBAAwB,cAAc,CAAC,MAAM,eAAe,EAAE;gBAChF,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI;aACrD,CAAC,CAAC;QACL,CAAC;QACD,IAAI,KAAK,IAAI,IAAI;YAAE,MAAM,IAAI,iBAAiB,CAAC,EAAC,IAAI,EAAE,KAAK,EAAC,CAAC,CAAC;IAChE,CAAC;CACF;AAED,KAAK,UAAU,gCAAgC,CAC7C,MAAuB,EACvB,EAAa,EACb,SAAe,EACf,MAAe;IAEf,iDAAiD;IACjD,IAAI,SAAS,IAAI,YAAY;QAAE,OAAO,EAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,GAAG,CAAC,EAAC,CAAC;IAE7E,oFAAoF;IACpF,sFAAsF;IACtF,uCAAuC;IACvC,sDAAsD;IACtD,4CAA4C;IAC5C,MAAM,oBAAoB,GAAG,CAC3B,MAAM,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC;QAC3B,EAAE,EAAE,SAAS;QACb,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,CAAC;KACT,CAAC,CACH,CAAC,CAAC,CAAC,CAAC;IAEL,IAAI,4BAAiD,CAAC;IACtD,IAAI,oBAAoB,IAAI,IAAI,EAAE,CAAC;QACjC,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACnE,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,iBAAiB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAC/D,4BAA4B,GAAG,EAAC,IAAI,EAAE,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,IAAI,EAAC,CAAC;QAC/E,MAAM,EAAE,KAAK,CAAC,4FAA4F,EAAE;YAC1G,IAAI,EAAE,SAAS,CAAC,4BAA4B,CAAC,IAAI,CAAC;YAClD,IAAI,EAAE,4BAA4B,CAAC,IAAI;SACxC,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,yEAAyE;QACzE,oCAAoC;QACpC,4BAA4B,GAAG,EAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY,GAAG,CAAC,EAAC,CAAC;IAC3E,CAAC;IACD,OAAO,4BAA4B,CAAC;AACtC,CAAC"}
1
+ {"version":3,"file":"backfill.js","sourceRoot":"","sources":["../../../src/sync/backfill/backfill.ts"],"names":[],"mappings":"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"}
package/lib/sync/backfill/verify.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { BeaconConfig } from "@lodestar/config";
2
- import { CachedBeaconStateAllForks } from "@lodestar/state-transition";
2
+ import { CachedBeaconStateAllForks, Index2PubkeyCache } from "@lodestar/state-transition";
3
3
  import { Root, SignedBeaconBlock, Slot } from "@lodestar/types";
4
4
  import { IBlsVerifier } from "../../chain/bls/index.js";
5
5
  import { BackfillSyncErrorCode } from "./errors.js";
@@ -15,5 +15,5 @@ export declare function verifyBlockSequence(config: BeaconConfig, blocks: Signed
15
15
  verifiedBlocks: SignedBeaconBlock[];
16
16
  error?: BackfillSyncErrorCode.NOT_LINEAR;
17
17
  };
18
- export declare function verifyBlockProposerSignature(bls: IBlsVerifier, state: CachedBeaconStateAllForks, blocks: SignedBeaconBlock[]): Promise<void>;
18
+ export declare function verifyBlockProposerSignature(index2pubkey: Index2PubkeyCache, bls: IBlsVerifier, state: CachedBeaconStateAllForks, blocks: SignedBeaconBlock[]): Promise<void>;
19
19
  //# sourceMappingURL=verify.d.ts.map
package/lib/sync/backfill/verify.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../src/sync/backfill/verify.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAC,yBAAyB,EAA8C,MAAM,4BAA4B,CAAC;AAClH,OAAO,EAAC,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAM,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAoB,qBAAqB,EAAC,MAAM,aAAa,CAAC;AAErE,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,IAAI,CAAC;IACX,IAAI,EAAE,IAAI,CAAC;CACZ,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,mBAAmB,GAAG;IAAC,KAAK,EAAE,iBAAiB,CAAA;CAAC,CAAC;AAE7E,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,iBAAiB,EAAE,EAC3B,UAAU,EAAE,IAAI,GACf;IACD,UAAU,EAAE,aAAa,GAAG,IAAI,CAAC;IACjC,cAAc,EAAE,iBAAiB,EAAE,CAAC;IACpC,KAAK,CAAC,EAAE,qBAAqB,CAAC,UAAU,CAAC;CAC1C,CAkBA;AAED,wBAAsB,4BAA4B,CAChD,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,yBAAyB,EAChC,MAAM,EAAE,iBAAiB,EAAE,GAC1B,OAAO,CAAC,IAAI,CAAC,CAWf"}
1
+ {"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../src/sync/backfill/verify.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EACL,yBAAyB,EAEzB,iBAAiB,EAElB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAC,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAM,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAoB,qBAAqB,EAAC,MAAM,aAAa,CAAC;AAErE,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,IAAI,CAAC;IACX,IAAI,EAAE,IAAI,CAAC;CACZ,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,mBAAmB,GAAG;IAAC,KAAK,EAAE,iBAAiB,CAAA;CAAC,CAAC;AAE7E,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,iBAAiB,EAAE,EAC3B,UAAU,EAAE,IAAI,GACf;IACD,UAAU,EAAE,aAAa,GAAG,IAAI,CAAC;IACjC,cAAc,EAAE,iBAAiB,EAAE,CAAC;IACpC,KAAK,CAAC,EAAE,qBAAqB,CAAC,UAAU,CAAC;CAC1C,CAkBA;AAED,wBAAsB,4BAA4B,CAChD,YAAY,EAAE,iBAAiB,EAC/B,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,yBAAyB,EAChC,MAAM,EAAE,iBAAiB,EAAE,GAC1B,OAAO,CAAC,IAAI,CAAC,CAWf"}
package/lib/sync/backfill/verify.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { GENESIS_SLOT } from "@lodestar/params";
2
- import { getBlockProposerSignatureSet } from "@lodestar/state-transition";
2
+ import { getBlockProposerSignatureSet, } from "@lodestar/state-transition";
3
3
  import { ssz } from "@lodestar/types";
4
4
  import { BackfillSyncError, BackfillSyncErrorCode } from "./errors.js";
5
5
  export function verifyBlockSequence(config, blocks, anchorRoot) {
@@ -20,13 +20,13 @@ export function verifyBlockSequence(config, blocks, anchorRoot) {
20
20
  }
21
21
  return { nextAnchor, verifiedBlocks };
22
22
  }
23
- export async function verifyBlockProposerSignature(bls, state, blocks) {
23
+ export async function verifyBlockProposerSignature(index2pubkey, bls, state, blocks) {
24
24
  if (blocks.length === 1 && blocks[0].message.slot === GENESIS_SLOT)
25
25
  return;
26
26
  const signatures = blocks.reduce((sigs, block) => {
27
27
  // genesis block doesn't have valid signature
28
28
  if (block.message.slot !== GENESIS_SLOT)
29
- sigs.push(getBlockProposerSignatureSet(state, block));
29
+ sigs.push(getBlockProposerSignatureSet(index2pubkey, state, block));
30
30
  return sigs;
31
31
  }, []);
32
32
  if (!(await bls.verifySignatureSets(signatures, { batchable: true }))) {
package/lib/sync/backfill/verify.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"verify.js","sourceRoot":"","sources":["../../../src/sync/backfill/verify.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAA2C,4BAA4B,EAAC,MAAM,4BAA4B,CAAC;AAClH,OAAO,EAAgC,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAEnE,OAAO,EAAC,iBAAiB,EAAE,qBAAqB,EAAC,MAAM,aAAa,CAAC;AASrE,MAAM,UAAU,mBAAmB,CACjC,MAAoB,EACpB,MAA2B,EAC3B,UAAgB;IAMhB,IAAI,QAAQ,GAAS,UAAU,CAAC;IAChC,IAAI,UAAU,GAAyB,IAAI,CAAC;IAE5C,MAAM,cAAc,GAAwB,EAAE,CAAC;IAC/C,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;QACrC,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAClG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,CAAC;YAC1C,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,CAAC;gBAC1C,MAAM,IAAI,iBAAiB,CAAC,EAAC,IAAI,EAAE,qBAAqB,CAAC,YAAY,EAAC,CAAC,CAAC;YAC1E,CAAC;YACD,OAAO,EAAC,UAAU,EAAE,cAAc,EAAE,KAAK,EAAE,qBAAqB,CAAC,UAAU,EAAC,CAAC;QAC/E,CAAC;QACD,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3B,UAAU,GAAG,EAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAC,CAAC;QACtE,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;IACtC,CAAC;IACD,OAAO,EAAC,UAAU,EAAE,cAAc,EAAC,CAAC;AACtC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAChD,GAAiB,EACjB,KAAgC,EAChC,MAA2B;IAE3B,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,YAAY;QAAE,OAAO;IAC3E,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,IAAqB,EAAE,KAAK,EAAE,EAAE;QAChE,6CAA6C;QAC7C,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,YAAY;YAAE,IAAI,CAAC,IAAI,CAAC,4BAA4B,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;QAC/F,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,mBAAmB,CAAC,UAAU,EAAE,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC,EAAE,CAAC;QACpE,MAAM,IAAI,iBAAiB,CAAC,EAAC,IAAI,EAAE,qBAAqB,CAAC,iBAAiB,EAAC,CAAC,CAAC;IAC/E,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"verify.js","sourceRoot":"","sources":["../../../src/sync/backfill/verify.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAIL,4BAA4B,GAC7B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAgC,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAEnE,OAAO,EAAC,iBAAiB,EAAE,qBAAqB,EAAC,MAAM,aAAa,CAAC;AASrE,MAAM,UAAU,mBAAmB,CACjC,MAAoB,EACpB,MAA2B,EAC3B,UAAgB;IAMhB,IAAI,QAAQ,GAAS,UAAU,CAAC;IAChC,IAAI,UAAU,GAAyB,IAAI,CAAC;IAE5C,MAAM,cAAc,GAAwB,EAAE,CAAC;IAC/C,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;QACrC,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAClG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,CAAC;YAC1C,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,CAAC;gBAC1C,MAAM,IAAI,iBAAiB,CAAC,EAAC,IAAI,EAAE,qBAAqB,CAAC,YAAY,EAAC,CAAC,CAAC;YAC1E,CAAC;YACD,OAAO,EAAC,UAAU,EAAE,cAAc,EAAE,KAAK,EAAE,qBAAqB,CAAC,UAAU,EAAC,CAAC;QAC/E,CAAC;QACD,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3B,UAAU,GAAG,EAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAC,CAAC;QACtE,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;IACtC,CAAC;IACD,OAAO,EAAC,UAAU,EAAE,cAAc,EAAC,CAAC;AACtC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAChD,YAA+B,EAC/B,GAAiB,EACjB,KAAgC,EAChC,MAA2B;IAE3B,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,YAAY;QAAE,OAAO;IAC3E,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,IAAqB,EAAE,KAAK,EAAE,EAAE;QAChE,6CAA6C;QAC7C,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,YAAY;YAAE,IAAI,CAAC,IAAI,CAAC,4BAA4B,CAAC,YAAY,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;QAC7G,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,mBAAmB,CAAC,UAAU,EAAE,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC,EAAE,CAAC;QACpE,MAAM,IAAI,iBAAiB,CAAC,EAAC,IAAI,EAAE,qBAAqB,CAAC,iBAAiB,EAAC,CAAC,CAAC;IAC/E,CAAC;AACH,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.38.0-dev.a8c0c7a156",
14
+ "version": "1.38.0-dev.ebc352f211",
15
15
  "type": "module",
16
16
  "exports": {
17
17
  ".": {
@@ -103,7 +103,6 @@
103
103
  "test:unit": "vitest run --project unit --project unit-minimal",
104
104
  "test:e2e": "vitest run --project e2e --project e2e-mainnet",
105
105
  "test:sim": "vitest run test/sim/**/*.test.ts",
106
- "test:sim:mergemock": "vitest run test/sim/mergemock.test.ts",
107
106
  "test:sim:blobs": "vitest run test/sim/4844-interop.test.ts",
108
107
  "download-spec-tests": "node --loader=ts-node/esm test/spec/downloadTests.ts",
109
108
  "test:spec:bls": "vitest run --project spec-minimal test/spec/bls/",
@@ -123,6 +122,7 @@
123
122
  "@chainsafe/persistent-merkle-tree": "^1.2.1",
124
123
  "@chainsafe/prometheus-gc-stats": "^1.0.0",
125
124
  "@chainsafe/pubkey-index-map": "^3.0.0",
125
+ "@chainsafe/snappy-wasm": "^0.5.0",
126
126
  "@chainsafe/ssz": "^1.2.2",
127
127
  "@chainsafe/threads": "^1.11.3",
128
128
  "@crate-crypto/node-eth-kzg": "0.9.1",
@@ -140,18 +140,18 @@
140
140
  "@libp2p/peer-id": "^5.1.0",
141
141
  "@libp2p/prometheus-metrics": "^4.3.15",
142
142
  "@libp2p/tcp": "^10.1.8",
143
- "@lodestar/api": "1.38.0-dev.a8c0c7a156",
144
- "@lodestar/config": "1.38.0-dev.a8c0c7a156",
145
- "@lodestar/db": "1.38.0-dev.a8c0c7a156",
146
- "@lodestar/fork-choice": "1.38.0-dev.a8c0c7a156",
147
- "@lodestar/light-client": "1.38.0-dev.a8c0c7a156",
148
- "@lodestar/logger": "1.38.0-dev.a8c0c7a156",
149
- "@lodestar/params": "1.38.0-dev.a8c0c7a156",
150
- "@lodestar/reqresp": "1.38.0-dev.a8c0c7a156",
151
- "@lodestar/state-transition": "1.38.0-dev.a8c0c7a156",
152
- "@lodestar/types": "1.38.0-dev.a8c0c7a156",
153
- "@lodestar/utils": "1.38.0-dev.a8c0c7a156",
154
- "@lodestar/validator": "1.38.0-dev.a8c0c7a156",
143
+ "@lodestar/api": "1.38.0-dev.ebc352f211",
144
+ "@lodestar/config": "1.38.0-dev.ebc352f211",
145
+ "@lodestar/db": "1.38.0-dev.ebc352f211",
146
+ "@lodestar/fork-choice": "1.38.0-dev.ebc352f211",
147
+ "@lodestar/light-client": "1.38.0-dev.ebc352f211",
148
+ "@lodestar/logger": "1.38.0-dev.ebc352f211",
149
+ "@lodestar/params": "1.38.0-dev.ebc352f211",
150
+ "@lodestar/reqresp": "1.38.0-dev.ebc352f211",
151
+ "@lodestar/state-transition": "1.38.0-dev.ebc352f211",
152
+ "@lodestar/types": "1.38.0-dev.ebc352f211",
153
+ "@lodestar/utils": "1.38.0-dev.ebc352f211",
154
+ "@lodestar/validator": "1.38.0-dev.ebc352f211",
155
155
  "@multiformats/multiaddr": "^12.1.3",
156
156
  "datastore-core": "^10.0.2",
157
157
  "datastore-fs": "^10.0.6",
@@ -166,7 +166,6 @@
166
166
  "multiformats": "^11.0.1",
167
167
  "prom-client": "^15.1.0",
168
168
  "qs": "^6.11.1",
169
- "snappyjs": "^0.7.0",
170
169
  "strict-event-emitter-types": "^2.0.0",
171
170
  "systeminformation": "^5.22.9",
172
171
  "uint8arraylist": "^2.4.7",
@@ -187,5 +186,5 @@
187
186
  "beacon",
188
187
  "blockchain"
189
188
  ],
190
- "gitHead": "0d8c7a4ddfa046c9e6aa4dcda86d56bc202e08a5"
189
+ "gitHead": "ccec71e0a2412fca7bf7dbd6a27239ddfc33d69c"
191
190
  }
package/src/api/impl/beacon/state/index.ts CHANGED
@@ -95,7 +95,7 @@ export function getBeaconStateApi({
95
95
  const {state, executionOptimistic, finalized} = await getState(stateId);
96
96
  const currentEpoch = getCurrentEpoch(state);
97
97
  const {validators, balances} = state; // Get the validators sub tree once for all the loop
98
- const {pubkey2index} = chain.getHeadState().epochCtx;
98
+ const {pubkey2index} = chain;
99
99
 
100
100
  const validatorResponses: routes.beacon.ValidatorResponse[] = [];
101
101
  if (validatorIds.length) {
@@ -154,7 +154,7 @@ export function getBeaconStateApi({
154
154
 
155
155
  async postStateValidatorIdentities({stateId, validatorIds = []}) {
156
156
  const {state, executionOptimistic, finalized} = await getState(stateId);
157
- const {pubkey2index} = chain.getHeadState().epochCtx;
157
+ const {pubkey2index} = chain;
158
158
 
159
159
  let validatorIdentities: routes.beacon.ValidatorIdentities;
160
160
 
@@ -187,7 +187,7 @@ export function getBeaconStateApi({
187
187
 
188
188
  async getStateValidator({stateId, validatorId}) {
189
189
  const {state, executionOptimistic, finalized} = await getState(stateId);
190
- const {pubkey2index} = chain.getHeadState().epochCtx;
190
+ const {pubkey2index} = chain;
191
191
 
192
192
  const resp = getStateValidatorIndex(validatorId, state, pubkey2index);
193
193
  if (!resp.valid) {
@@ -212,10 +212,9 @@ export function getBeaconStateApi({
212
212
  if (validatorIds.length) {
213
213
  assertUniqueItems(validatorIds, "Duplicate validator IDs provided");
214
214
 
215
- const headState = chain.getHeadState();
216
215
  const balances: routes.beacon.ValidatorBalance[] = [];
217
216
  for (const id of validatorIds) {
218
- const resp = getStateValidatorIndex(id, state, headState.epochCtx.pubkey2index);
217
+ const resp = getStateValidatorIndex(id, state, chain.pubkey2index);
219
218
 
220
219
  if (resp.valid) {
221
220
  balances.push({
package/src/api/impl/beacon/state/utils.ts CHANGED
@@ -71,9 +71,11 @@ export async function getStateResponseWithRegen(
71
71
  typeof stateId === "string"
72
72
  ? await chain.getStateByStateRoot(stateId, {allowRegen: true})
73
73
  : typeof stateId === "number"
74
- ? stateId >= chain.forkChoice.getFinalizedBlock().slot
75
- ? await chain.getStateBySlot(stateId, {allowRegen: true})
76
- : await chain.getHistoricalStateBySlot(stateId)
74
+ ? stateId > chain.clock.currentSlot
75
+ ? null // Don't try to serve future slots
76
+ : stateId >= chain.forkChoice.getFinalizedBlock().slot
77
+ ? await chain.getStateBySlot(stateId, {allowRegen: true})
78
+ : await chain.getHistoricalStateBySlot(stateId)
77
79
  : await chain.getStateOrBytesByCheckpoint(stateId);
78
80
 
79
81
  if (!res) {
package/src/api/impl/validator/index.ts CHANGED
@@ -1511,7 +1511,7 @@ export function getValidatorApi(
1511
1511
 
1512
1512
  const filteredRegistrations = registrations.filter((registration) => {
1513
1513
  const {pubkey} = registration.message;
1514
- const validatorIndex = headState.epochCtx.pubkey2index.get(pubkey);
1514
+ const validatorIndex = chain.pubkey2index.get(pubkey);
1515
1515
  if (validatorIndex === null) return false;
1516
1516
 
1517
1517
  const validator = headState.validators.getReadonly(validatorIndex);
package/src/chain/blocks/importBlock.ts CHANGED
@@ -70,7 +70,8 @@ export async function importBlock(
70
70
  fullyVerifiedBlock: FullyVerifiedBlock,
71
71
  opts: ImportBlockOpts
72
72
  ): Promise<void> {
73
- const {blockInput, postState, parentBlockSlot, executionStatus, dataAvailabilityStatus} = fullyVerifiedBlock;
73
+ const {blockInput, postState, parentBlockSlot, executionStatus, dataAvailabilityStatus, indexedAttestations} =
74
+ fullyVerifiedBlock;
74
75
  const block = blockInput.getBlock();
75
76
  const source = blockInput.getBlockSource();
76
77
  const {slot: blockSlot} = block.message;
@@ -138,10 +139,10 @@ export async function importBlock(
138
139
 
139
140
  const addAttestation = fork >= ForkSeq.electra ? addAttestationPostElectra : addAttestationPreElectra;
140
141
 
141
- for (const attestation of attestations) {
142
+ for (let i = 0; i < attestations.length; i++) {
143
+ const attestation = attestations[i];
142
144
  try {
143
- // TODO Electra: figure out how to reuse the attesting indices computed from state transition
144
- const indexedAttestation = postState.epochCtx.getIndexedAttestation(fork, attestation);
145
+ const indexedAttestation = indexedAttestations[i];
145
146
  const {target, beaconBlockRoot} = attestation.data;
146
147
 
147
148
  const attDataRoot = toRootHex(ssz.phase0.AttestationData.hashTreeRoot(indexedAttestation.data));
package/src/chain/blocks/index.ts CHANGED
@@ -72,7 +72,7 @@ export async function processBlocks(
72
72
 
73
73
  // Fully verify a block to be imported immediately after. Does not produce any side-effects besides adding intermediate
74
74
  // states in the state cache through regen.
75
- const {postStates, dataAvailabilityStatuses, proposerBalanceDeltas, segmentExecStatus} =
75
+ const {postStates, dataAvailabilityStatuses, proposerBalanceDeltas, segmentExecStatus, indexedAttestationsByBlock} =
76
76
  await verifyBlocksInEpoch.call(this, parentBlock, relevantBlocks, opts);
77
77
 
78
78
  // If segmentExecStatus has lvhForkchoice then, the entire segment should be invalid
@@ -94,6 +94,7 @@ export async function processBlocks(
94
94
  // start supporting optimistic syncing/processing
95
95
  dataAvailabilityStatus: dataAvailabilityStatuses[i],
96
96
  proposerBalanceDelta: proposerBalanceDeltas[i],
97
+ indexedAttestations: indexedAttestationsByBlock[i],
97
98
  // TODO: Make this param mandatory and capture in gossip
98
99
  seenTimestampSec: opts.seenTimestampSec ?? Math.floor(Date.now() / 1000),
99
100
  })
package/src/chain/blocks/types.ts CHANGED
@@ -2,7 +2,7 @@ import type {ChainForkConfig} from "@lodestar/config";
2
2
  import {MaybeValidExecutionStatus} from "@lodestar/fork-choice";
3
3
  import {ForkSeq} from "@lodestar/params";
4
4
  import {CachedBeaconStateAllForks, DataAvailabilityStatus, computeEpochAtSlot} from "@lodestar/state-transition";
5
- import type {Slot, fulu} from "@lodestar/types";
5
+ import type {IndexedAttestation, Slot, fulu} from "@lodestar/types";
6
6
  import {IBlockInput} from "./blockInput/types.js";
7
7
 
8
8
  export enum GossipedInputType {
@@ -96,6 +96,10 @@ export type FullyVerifiedBlock = {
96
96
  */
97
97
  executionStatus: MaybeValidExecutionStatus;
98
98
  dataAvailabilityStatus: DataAvailabilityStatus;
99
+ /**
100
+ * Pre-computed indexed attestations from signature verification to avoid duplicate work
101
+ */
102
+ indexedAttestations: IndexedAttestation[];
99
103
  /** Seen timestamp seconds */
100
104
  seenTimestampSec: number;
101
105
  };