@lodestar/beacon-node 1.51.0-dev.83da04fef3 → 1.51.0-dev.99bbd7b976

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 (258) hide show
  1. package/lib/api/impl/api.js +1 -1
  2. package/lib/api/impl/api.js.map +1 -1
  3. package/lib/api/impl/beacon/blocks/index.d.ts +2 -1
  4. package/lib/api/impl/beacon/blocks/index.d.ts.map +1 -1
  5. package/lib/api/impl/beacon/blocks/index.js +12 -7
  6. package/lib/api/impl/beacon/blocks/index.js.map +1 -1
  7. package/lib/api/impl/beacon/index.d.ts +2 -1
  8. package/lib/api/impl/beacon/index.d.ts.map +1 -1
  9. package/lib/api/impl/beacon/index.js +2 -2
  10. package/lib/api/impl/beacon/index.js.map +1 -1
  11. package/lib/api/impl/beacon/state/index.d.ts.map +1 -1
  12. package/lib/api/impl/beacon/state/index.js +8 -2
  13. package/lib/api/impl/beacon/state/index.js.map +1 -1
  14. package/lib/api/impl/beacon/state/utils.d.ts +2 -1
  15. package/lib/api/impl/beacon/state/utils.d.ts.map +1 -1
  16. package/lib/api/impl/beacon/state/utils.js +17 -9
  17. package/lib/api/impl/beacon/state/utils.js.map +1 -1
  18. package/lib/api/impl/debug/index.d.ts.map +1 -1
  19. package/lib/api/impl/debug/index.js +3 -0
  20. package/lib/api/impl/debug/index.js.map +1 -1
  21. package/lib/api/impl/validator/index.d.ts.map +1 -1
  22. package/lib/api/impl/validator/index.js +102 -10
  23. package/lib/api/impl/validator/index.js.map +1 -1
  24. package/lib/api/options.d.ts +2 -0
  25. package/lib/api/options.d.ts.map +1 -1
  26. package/lib/api/options.js +1 -0
  27. package/lib/api/options.js.map +1 -1
  28. package/lib/chain/ColumnReconstructionTracker.d.ts +11 -11
  29. package/lib/chain/ColumnReconstructionTracker.d.ts.map +1 -1
  30. package/lib/chain/ColumnReconstructionTracker.js +46 -40
  31. package/lib/chain/ColumnReconstructionTracker.js.map +1 -1
  32. package/lib/chain/archiveStore/utils/archiveBlocks.d.ts.map +1 -1
  33. package/lib/chain/archiveStore/utils/archiveBlocks.js +54 -96
  34. package/lib/chain/archiveStore/utils/archiveBlocks.js.map +1 -1
  35. package/lib/chain/blocks/importBlock.d.ts.map +1 -1
  36. package/lib/chain/blocks/importBlock.js +3 -2
  37. package/lib/chain/blocks/importBlock.js.map +1 -1
  38. package/lib/chain/blocks/importExecutionPayload.d.ts.map +1 -1
  39. package/lib/chain/blocks/importExecutionPayload.js +50 -2
  40. package/lib/chain/blocks/importExecutionPayload.js.map +1 -1
  41. package/lib/chain/blocks/types.d.ts +4 -0
  42. package/lib/chain/blocks/types.d.ts.map +1 -1
  43. package/lib/chain/blocks/types.js +5 -0
  44. package/lib/chain/blocks/types.js.map +1 -1
  45. package/lib/chain/chain.d.ts +2 -1
  46. package/lib/chain/chain.d.ts.map +1 -1
  47. package/lib/chain/chain.js +5 -1
  48. package/lib/chain/chain.js.map +1 -1
  49. package/lib/chain/errors/executionPayloadBid.d.ts +11 -1
  50. package/lib/chain/errors/executionPayloadBid.d.ts.map +1 -1
  51. package/lib/chain/errors/executionPayloadBid.js +2 -0
  52. package/lib/chain/errors/executionPayloadBid.js.map +1 -1
  53. package/lib/chain/errors/inclusionList.d.ts +60 -0
  54. package/lib/chain/errors/inclusionList.d.ts.map +1 -0
  55. package/lib/chain/errors/inclusionList.js +19 -0
  56. package/lib/chain/errors/inclusionList.js.map +1 -0
  57. package/lib/chain/errors/index.d.ts +1 -0
  58. package/lib/chain/errors/index.d.ts.map +1 -1
  59. package/lib/chain/errors/index.js +1 -0
  60. package/lib/chain/errors/index.js.map +1 -1
  61. package/lib/chain/interface.d.ts +2 -1
  62. package/lib/chain/interface.d.ts.map +1 -1
  63. package/lib/chain/interface.js.map +1 -1
  64. package/lib/chain/opPools/inclusionListStore.d.ts +63 -0
  65. package/lib/chain/opPools/inclusionListStore.d.ts.map +1 -0
  66. package/lib/chain/opPools/inclusionListStore.js +171 -0
  67. package/lib/chain/opPools/inclusionListStore.js.map +1 -0
  68. package/lib/chain/opPools/index.d.ts +1 -0
  69. package/lib/chain/opPools/index.d.ts.map +1 -1
  70. package/lib/chain/opPools/index.js +1 -0
  71. package/lib/chain/opPools/index.js.map +1 -1
  72. package/lib/chain/produceBlock/produceBlockBody.d.ts +3 -1
  73. package/lib/chain/produceBlock/produceBlockBody.d.ts.map +1 -1
  74. package/lib/chain/produceBlock/produceBlockBody.js +30 -10
  75. package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
  76. package/lib/chain/regen/interface.d.ts +1 -1
  77. package/lib/chain/regen/interface.d.ts.map +1 -1
  78. package/lib/chain/regen/interface.js +1 -1
  79. package/lib/chain/regen/interface.js.map +1 -1
  80. package/lib/chain/validation/executionPayloadBid.d.ts +0 -15
  81. package/lib/chain/validation/executionPayloadBid.d.ts.map +1 -1
  82. package/lib/chain/validation/executionPayloadBid.js +24 -145
  83. package/lib/chain/validation/executionPayloadBid.js.map +1 -1
  84. package/lib/chain/validation/inclusionList.d.ts +14 -0
  85. package/lib/chain/validation/inclusionList.d.ts.map +1 -0
  86. package/lib/chain/validation/inclusionList.js +150 -0
  87. package/lib/chain/validation/inclusionList.js.map +1 -0
  88. package/lib/chain/validation/index.d.ts +1 -0
  89. package/lib/chain/validation/index.d.ts.map +1 -1
  90. package/lib/chain/validation/index.js +1 -0
  91. package/lib/chain/validation/index.js.map +1 -1
  92. package/lib/db/beacon.d.ts.map +1 -1
  93. package/lib/db/beacon.js +2 -0
  94. package/lib/db/beacon.js.map +1 -1
  95. package/lib/execution/builder/validateBid.d.ts.map +1 -1
  96. package/lib/execution/builder/validateBid.js +14 -1
  97. package/lib/execution/builder/validateBid.js.map +1 -1
  98. package/lib/execution/engine/blobVersionedHashes.d.ts +1 -1
  99. package/lib/execution/engine/blobVersionedHashes.d.ts.map +1 -1
  100. package/lib/execution/engine/blobVersionedHashes.js.map +1 -1
  101. package/lib/execution/engine/disabled.d.ts +1 -0
  102. package/lib/execution/engine/disabled.d.ts.map +1 -1
  103. package/lib/execution/engine/disabled.js +3 -0
  104. package/lib/execution/engine/disabled.js.map +1 -1
  105. package/lib/execution/engine/http.d.ts +8 -2
  106. package/lib/execution/engine/http.d.ts.map +1 -1
  107. package/lib/execution/engine/http.js +27 -4
  108. package/lib/execution/engine/http.js.map +1 -1
  109. package/lib/execution/engine/interface.d.ts +11 -2
  110. package/lib/execution/engine/interface.d.ts.map +1 -1
  111. package/lib/execution/engine/interface.js.map +1 -1
  112. package/lib/execution/engine/jsonRpcTransport.d.ts +3 -2
  113. package/lib/execution/engine/jsonRpcTransport.d.ts.map +1 -1
  114. package/lib/execution/engine/jsonRpcTransport.js +33 -9
  115. package/lib/execution/engine/jsonRpcTransport.js.map +1 -1
  116. package/lib/execution/engine/mock.d.ts +1 -0
  117. package/lib/execution/engine/mock.d.ts.map +1 -1
  118. package/lib/execution/engine/mock.js +31 -7
  119. package/lib/execution/engine/mock.js.map +1 -1
  120. package/lib/execution/engine/payloadIdCache.d.ts +5 -3
  121. package/lib/execution/engine/payloadIdCache.d.ts.map +1 -1
  122. package/lib/execution/engine/payloadIdCache.js +15 -4
  123. package/lib/execution/engine/payloadIdCache.js.map +1 -1
  124. package/lib/execution/engine/restTransport.d.ts +2 -1
  125. package/lib/execution/engine/restTransport.d.ts.map +1 -1
  126. package/lib/execution/engine/restTransport.js +3 -0
  127. package/lib/execution/engine/restTransport.js.map +1 -1
  128. package/lib/execution/engine/sszTypes.d.ts +38 -38
  129. package/lib/execution/engine/transport.d.ts +5 -2
  130. package/lib/execution/engine/transport.d.ts.map +1 -1
  131. package/lib/execution/engine/types.d.ts +25 -1
  132. package/lib/execution/engine/types.d.ts.map +1 -1
  133. package/lib/execution/engine/types.js +17 -4
  134. package/lib/execution/engine/types.js.map +1 -1
  135. package/lib/index.d.ts +1 -0
  136. package/lib/index.d.ts.map +1 -1
  137. package/lib/index.js +2 -0
  138. package/lib/index.js.map +1 -1
  139. package/lib/metrics/metrics/beacon.d.ts +16 -0
  140. package/lib/metrics/metrics/beacon.d.ts.map +1 -1
  141. package/lib/metrics/metrics/beacon.js +35 -0
  142. package/lib/metrics/metrics/beacon.js.map +1 -1
  143. package/lib/metrics/metrics/lodestar.d.ts +19 -0
  144. package/lib/metrics/metrics/lodestar.d.ts.map +1 -1
  145. package/lib/metrics/metrics/lodestar.js +49 -0
  146. package/lib/metrics/metrics/lodestar.js.map +1 -1
  147. package/lib/network/gossip/interface.d.ts +8 -2
  148. package/lib/network/gossip/interface.d.ts.map +1 -1
  149. package/lib/network/gossip/interface.js +1 -0
  150. package/lib/network/gossip/interface.js.map +1 -1
  151. package/lib/network/gossip/topic.d.ts +13 -5
  152. package/lib/network/gossip/topic.d.ts.map +1 -1
  153. package/lib/network/gossip/topic.js +13 -1
  154. package/lib/network/gossip/topic.js.map +1 -1
  155. package/lib/network/interface.d.ts +2 -1
  156. package/lib/network/interface.d.ts.map +1 -1
  157. package/lib/network/network.d.ts +2 -1
  158. package/lib/network/network.d.ts.map +1 -1
  159. package/lib/network/network.js +5 -0
  160. package/lib/network/network.js.map +1 -1
  161. package/lib/network/peers/utils/enrSubnetsDeserialize.d.ts.map +1 -1
  162. package/lib/network/peers/utils/enrSubnetsDeserialize.js +5 -2
  163. package/lib/network/peers/utils/enrSubnetsDeserialize.js.map +1 -1
  164. package/lib/network/processor/gossipHandlers.d.ts.map +1 -1
  165. package/lib/network/processor/gossipHandlers.js +67 -19
  166. package/lib/network/processor/gossipHandlers.js.map +1 -1
  167. package/lib/network/processor/gossipQueues/index.d.ts.map +1 -1
  168. package/lib/network/processor/gossipQueues/index.js +6 -0
  169. package/lib/network/processor/gossipQueues/index.js.map +1 -1
  170. package/lib/network/processor/gossipValidatorFn.d.ts.map +1 -1
  171. package/lib/network/processor/gossipValidatorFn.js +5 -1
  172. package/lib/network/processor/gossipValidatorFn.js.map +1 -1
  173. package/lib/network/processor/index.d.ts +5 -0
  174. package/lib/network/processor/index.d.ts.map +1 -1
  175. package/lib/network/processor/index.js +37 -26
  176. package/lib/network/processor/index.js.map +1 -1
  177. package/lib/network/reqresp/ReqRespBeaconNode.d.ts.map +1 -1
  178. package/lib/network/reqresp/ReqRespBeaconNode.js +6 -0
  179. package/lib/network/reqresp/ReqRespBeaconNode.js.map +1 -1
  180. package/lib/network/reqresp/handlers/inclusionListsByIndices.d.ts +10 -0
  181. package/lib/network/reqresp/handlers/inclusionListsByIndices.d.ts.map +1 -0
  182. package/lib/network/reqresp/handlers/inclusionListsByIndices.js +30 -0
  183. package/lib/network/reqresp/handlers/inclusionListsByIndices.js.map +1 -0
  184. package/lib/network/reqresp/handlers/index.d.ts.map +1 -1
  185. package/lib/network/reqresp/handlers/index.js +5 -0
  186. package/lib/network/reqresp/handlers/index.js.map +1 -1
  187. package/lib/network/reqresp/protocols.d.ts +1 -0
  188. package/lib/network/reqresp/protocols.d.ts.map +1 -1
  189. package/lib/network/reqresp/protocols.js +5 -0
  190. package/lib/network/reqresp/protocols.js.map +1 -1
  191. package/lib/network/reqresp/rateLimit.d.ts.map +1 -1
  192. package/lib/network/reqresp/rateLimit.js +4 -0
  193. package/lib/network/reqresp/rateLimit.js.map +1 -1
  194. package/lib/network/reqresp/types.d.ts +5 -2
  195. package/lib/network/reqresp/types.d.ts.map +1 -1
  196. package/lib/network/reqresp/types.js +3 -0
  197. package/lib/network/reqresp/types.js.map +1 -1
  198. package/lib/sync/unknownBlock.d.ts.map +1 -1
  199. package/lib/sync/unknownBlock.js +42 -18
  200. package/lib/sync/unknownBlock.js.map +1 -1
  201. package/package.json +30 -30
  202. package/src/api/impl/api.ts +1 -1
  203. package/src/api/impl/beacon/blocks/index.ts +22 -17
  204. package/src/api/impl/beacon/index.ts +3 -1
  205. package/src/api/impl/beacon/state/index.ts +10 -1
  206. package/src/api/impl/beacon/state/utils.ts +19 -9
  207. package/src/api/impl/debug/index.ts +4 -0
  208. package/src/api/impl/validator/index.ts +132 -10
  209. package/src/api/options.ts +3 -0
  210. package/src/chain/ColumnReconstructionTracker.ts +60 -41
  211. package/src/chain/archiveStore/utils/archiveBlocks.ts +64 -126
  212. package/src/chain/blocks/importBlock.ts +3 -7
  213. package/src/chain/blocks/importExecutionPayload.ts +68 -2
  214. package/src/chain/blocks/types.ts +5 -0
  215. package/src/chain/chain.ts +5 -0
  216. package/src/chain/errors/executionPayloadBid.ts +12 -0
  217. package/src/chain/errors/inclusionList.ts +38 -0
  218. package/src/chain/errors/index.ts +1 -0
  219. package/src/chain/interface.ts +2 -0
  220. package/src/chain/opPools/inclusionListStore.ts +208 -0
  221. package/src/chain/opPools/index.ts +1 -0
  222. package/src/chain/produceBlock/produceBlockBody.ts +60 -19
  223. package/src/chain/regen/interface.ts +1 -1
  224. package/src/chain/validation/executionPayloadBid.ts +40 -170
  225. package/src/chain/validation/inclusionList.ts +192 -0
  226. package/src/chain/validation/index.ts +1 -0
  227. package/src/db/beacon.ts +5 -0
  228. package/src/execution/builder/validateBid.ts +23 -2
  229. package/src/execution/engine/blobVersionedHashes.ts +1 -1
  230. package/src/execution/engine/disabled.ts +4 -0
  231. package/src/execution/engine/http.ts +40 -5
  232. package/src/execution/engine/interface.ts +27 -3
  233. package/src/execution/engine/jsonRpcTransport.ts +46 -9
  234. package/src/execution/engine/mock.ts +32 -7
  235. package/src/execution/engine/payloadIdCache.ts +24 -6
  236. package/src/execution/engine/restTransport.ts +15 -1
  237. package/src/execution/engine/transport.ts +7 -2
  238. package/src/execution/engine/types.ts +41 -6
  239. package/src/index.ts +2 -0
  240. package/src/metrics/metrics/beacon.ts +37 -0
  241. package/src/metrics/metrics/lodestar.ts +51 -0
  242. package/src/network/gossip/interface.ts +5 -0
  243. package/src/network/gossip/topic.ts +14 -0
  244. package/src/network/interface.ts +2 -0
  245. package/src/network/network.ts +11 -0
  246. package/src/network/peers/utils/enrSubnetsDeserialize.ts +5 -2
  247. package/src/network/processor/gossipHandlers.ts +87 -21
  248. package/src/network/processor/gossipQueues/index.ts +6 -0
  249. package/src/network/processor/gossipValidatorFn.ts +5 -0
  250. package/src/network/processor/index.ts +33 -24
  251. package/src/network/processor/types.ts +1 -1
  252. package/src/network/reqresp/ReqRespBeaconNode.ts +7 -0
  253. package/src/network/reqresp/handlers/inclusionListsByIndices.ts +44 -0
  254. package/src/network/reqresp/handlers/index.ts +5 -0
  255. package/src/network/reqresp/protocols.ts +6 -0
  256. package/src/network/reqresp/rateLimit.ts +4 -0
  257. package/src/network/reqresp/types.ts +6 -0
  258. package/src/sync/unknownBlock.ts +47 -28
@@ -62,7 +62,7 @@ import {
62
62
  } from "../../../../chain/produceBlock/index.js";
63
63
  import {RegenCaller} from "../../../../chain/regen/index.js";
64
64
  import {validateGossipBlock, verifyBlockProposerSignature} from "../../../../chain/validation/block.js";
65
- import {validateApiExecutionPayloadBid} from "../../../../chain/validation/executionPayloadBid.js";
65
+ import {validateGossipExecutionPayloadBid} from "../../../../chain/validation/executionPayloadBid.js";
66
66
  import {validateApiExecutionPayloadEnvelope} from "../../../../chain/validation/executionPayloadEnvelope.js";
67
67
  import {OpSource} from "../../../../chain/validatorMonitor.js";
68
68
  import {
@@ -79,6 +79,7 @@ import {
79
79
  import {isOptimisticBlock} from "../../../../util/forkChoice.js";
80
80
  import {kzg} from "../../../../util/kzg.js";
81
81
  import {promiseAllMaybeAsync} from "../../../../util/promises.js";
82
+ import {ApiOptions} from "../../../options.js";
82
83
  import {ApiModules} from "../../types.js";
83
84
  import {assertUniqueItems} from "../../utils.js";
84
85
  import {getBlockResponse, toBeaconHeaderResponse} from "./utils.js";
@@ -96,16 +97,10 @@ const MAX_API_CLOCK_DISPARITY_MS = 1000;
96
97
  */
97
98
  const IDENTITY_PEER_ID = ""; // TODO: Compute identity keypair
98
99
 
99
- export function getBeaconBlockApi({
100
- chain,
101
- config,
102
- metrics,
103
- network,
104
- db,
105
- }: Pick<
106
- ApiModules,
107
- "chain" | "config" | "metrics" | "network" | "db"
108
- >): ApplicationMethods<routes.beacon.block.Endpoints> {
100
+ export function getBeaconBlockApi(
101
+ opts: ApiOptions,
102
+ {chain, config, metrics, network, db}: Pick<ApiModules, "chain" | "config" | "metrics" | "network" | "db">
103
+ ): ApplicationMethods<routes.beacon.block.Endpoints> {
109
104
  const publishBlockV2: ApplicationMethods<routes.beacon.block.Endpoints>["publishBlockV2"] = async (
110
105
  {signedBlockContents, broadcastValidation, builderUrl},
111
106
  context,
@@ -1077,15 +1072,25 @@ export function getBeaconBlockApi({
1077
1072
  throw new ApiError(400, `publishExecutionPayloadBid not supported for pre-gloas fork=${fork}`);
1078
1073
  }
1079
1074
 
1080
- const validationTimer = metrics?.opPool.executionPayloadBidPool.apiValidationTime.startTimer();
1081
- // TODO: once the builder is tested and can be trusted, skip this local validation
1082
- // to publish faster, accepting peer-score risk if it ever emits an invalid bid.
1083
- await validateApiExecutionPayloadBid(chain, signedExecutionPayloadBid);
1084
- validationTimer?.();
1085
-
1086
1075
  const elapsedSec = chain.clock.secFromSlot(slot, seenTimestampSec);
1087
1076
  metrics?.gossipExecutionPayloadBid.elapsedTimeTillReceived.observe({source: OpSource.api}, elapsedSec);
1088
1077
 
1078
+ if (!opts.disableBidValidation) {
1079
+ const validationTimer = metrics?.opPool.executionPayloadBidPool.apiValidationTime.startTimer();
1080
+ const {proposerIndex} = await validateGossipExecutionPayloadBid(chain, signedExecutionPayloadBid);
1081
+ validationTimer?.();
1082
+
1083
+ // Gossip does not deliver our own messages back to us, so a validated bid is added to the
1084
+ // pool here to allow a proposer on this node to select it
1085
+ const insertOutcome = chain.executionPayloadBidPool.add(
1086
+ signedExecutionPayloadBid,
1087
+ Math.floor(elapsedSec * 1000)
1088
+ );
1089
+ metrics?.opPool.executionPayloadBidPool.apiInsertOutcome.inc({insertOutcome});
1090
+
1091
+ chain.validatorMonitor?.registerExecutionPayloadBid(OpSource.api, proposerIndex, bid);
1092
+ }
1093
+
1089
1094
  const sentPeers = await network.publishSignedExecutionPayloadBid(signedExecutionPayloadBid);
1090
1095
 
1091
1096
  chain.emitter.emit(routes.events.EventType.executionPayloadBid, {
@@ -3,6 +3,7 @@ import {ApplicationMethods} from "@lodestar/api/server";
3
3
  import {isForkPostGloas} from "@lodestar/params";
4
4
  import {computeStartSlotAtEpoch} from "@lodestar/state-transition";
5
5
  import {toRootHex} from "@lodestar/utils";
6
+ import {ApiOptions} from "../../options.js";
6
7
  import {ApiError} from "../errors.js";
7
8
  import {ApiModules} from "../types.js";
8
9
  import {getBeaconBlockApi} from "./blocks/index.js";
@@ -11,9 +12,10 @@ import {getBeaconRewardsApi} from "./rewards/index.js";
11
12
  import {getBeaconStateApi} from "./state/index.js";
12
13
 
13
14
  export function getBeaconApi(
15
+ opts: ApiOptions,
14
16
  modules: Pick<ApiModules, "chain" | "config" | "logger" | "metrics" | "network" | "db" | "sync">
15
17
  ): ApplicationMethods<routes.beacon.Endpoints> {
16
- const block = getBeaconBlockApi(modules);
18
+ const block = getBeaconBlockApi(opts, modules);
17
19
  const pool = getBeaconPoolApi(modules);
18
20
  const state = getBeaconStateApi(modules);
19
21
  const rewards = getBeaconRewardsApi(modules);
@@ -17,6 +17,7 @@ import {
17
17
  isStatePostGloas,
18
18
  } from "@lodestar/state-transition";
19
19
  import {
20
+ BuilderIndex,
20
21
  ValidatorIndex,
21
22
  getBuilderStatus,
22
23
  getValidatorStatus,
@@ -29,6 +30,7 @@ import {ApiModules} from "../../types.js";
29
30
  import {assertUniqueItems} from "../../utils.js";
30
31
  import {
31
32
  filterStateValidatorsByStatus,
33
+ getBuilderIndexByPubkey,
32
34
  getStateBuilderIndex,
33
35
  getStateResponseWithRegen,
34
36
  getStateValidatorIndex,
@@ -170,8 +172,15 @@ export function getBeaconStateApi({
170
172
  if (builderIds.length) {
171
173
  assertUniqueItems(builderIds, "Duplicate builder IDs provided");
172
174
 
175
+ // There is no builder pubkey cache, scan the registry at most once per request
176
+ let builderIndexByPubkey: Map<string, BuilderIndex> | null = null;
177
+ const getBuilderIndexByPubkeyMap = () => {
178
+ builderIndexByPubkey ??= getBuilderIndexByPubkey(state);
179
+ return builderIndexByPubkey;
180
+ };
181
+
173
182
  for (const id of builderIds) {
174
- const resp = getStateBuilderIndex(id, state);
183
+ const resp = getStateBuilderIndex(id, state, getBuilderIndexByPubkeyMap);
175
184
  if (resp.valid) {
176
185
  const builderIndex = resp.builderIndex;
177
186
  const builder = state.getBuilder(builderIndex);
@@ -13,7 +13,7 @@ import {
13
13
  getValidatorStatus,
14
14
  phase0,
15
15
  } from "@lodestar/types";
16
- import {byteArrayEquals, fromHex} from "@lodestar/utils";
16
+ import {fromHex, toHex} from "@lodestar/utils";
17
17
  import {IBeaconChain} from "../../../../chain/index.js";
18
18
  import {GENESIS_EPOCH} from "../../../../constants/index.js";
19
19
  import {IBeaconSync} from "../../../../sync/index.js";
@@ -118,9 +118,22 @@ type StateBuilderIndexResponse =
118
118
  | {valid: true; builderIndex: BuilderIndex}
119
119
  | {valid: false; code: number; reason: string};
120
120
 
121
+ export function getBuilderIndexByPubkey(state: IBeaconStateViewGloas): Map<string, BuilderIndex> {
122
+ const builderIndexByPubkey = new Map<string, BuilderIndex>();
123
+ const buildersLength = state.getBuildersLength();
124
+ for (let builderIndex = 0; builderIndex < buildersLength; builderIndex++) {
125
+ const pubkeyHex = toHex(state.getBuilder(builderIndex).pubkey);
126
+ if (!builderIndexByPubkey.has(pubkeyHex)) {
127
+ builderIndexByPubkey.set(pubkeyHex, builderIndex);
128
+ }
129
+ }
130
+ return builderIndexByPubkey;
131
+ }
132
+
121
133
  export function getStateBuilderIndex(
122
134
  id: routes.beacon.BuilderId | BLSPubkey,
123
- state: IBeaconStateViewGloas
135
+ state: IBeaconStateViewGloas,
136
+ getBuilderIndexByPubkeyMap: () => Map<string, BuilderIndex>
124
137
  ): StateBuilderIndexResponse {
125
138
  if (typeof id === "string") {
126
139
  // mutate `id` and fallthrough to below
@@ -148,14 +161,11 @@ export function getStateBuilderIndex(
148
161
  }
149
162
 
150
163
  // typeof id === Uint8Array
151
- // There is no builder pubkey cache, linear scan over the registry
152
- const buildersLength = state.getBuildersLength();
153
- for (let builderIndex = 0; builderIndex < buildersLength; builderIndex++) {
154
- if (byteArrayEquals(state.getBuilder(builderIndex).pubkey, id)) {
155
- return {valid: true, builderIndex};
156
- }
164
+ const builderIndex = getBuilderIndexByPubkeyMap().get(toHex(id));
165
+ if (builderIndex === undefined) {
166
+ return {valid: false, code: 404, reason: "Builder pubkey not found in state"};
157
167
  }
158
- return {valid: false, code: 404, reason: "Builder pubkey not found in state"};
168
+ return {valid: true, builderIndex};
159
169
  }
160
170
 
161
171
  export function filterStateValidatorsByStatus(
@@ -114,6 +114,10 @@ export function getDebugApi({
114
114
  unrealizedJustifiedRoot: node.unrealizedJustifiedRoot,
115
115
  unrealizedFinalizedEpoch: node.unrealizedFinalizedEpoch,
116
116
  unrealizedFinalizedRoot: node.unrealizedFinalizedRoot,
117
+ inclusionListSatisfied:
118
+ node.payloadStatus === PayloadStatus.FULL
119
+ ? forkChoice.getPayloadInclusionListSatisfaction(node.blockRoot)
120
+ : null,
117
121
  },
118
122
  };
119
123
  }),
@@ -18,6 +18,7 @@ import {
18
18
  isForkPostElectra,
19
19
  isForkPostFulu,
20
20
  isForkPostGloas,
21
+ isForkPostHeze,
21
22
  } from "@lodestar/params";
22
23
  import {
23
24
  DataAvailabilityStatus,
@@ -28,6 +29,7 @@ import {
28
29
  computeStartSlotAtEpoch,
29
30
  computeTimeAtSlot,
30
31
  getCurrentSlot,
32
+ getInclusionListCommittee,
31
33
  isStatePostAltair,
32
34
  isStatePostGloas,
33
35
  proposerShufflingDecisionRoot,
@@ -68,6 +70,7 @@ import {
68
70
  } from "@lodestar/utils";
69
71
  import {MAX_BUILDER_BOOST_FACTOR} from "@lodestar/validator";
70
72
  import {BlockInputSource} from "../../../chain/blocks/blockInput/types.js";
73
+ import {InclusionListSource} from "../../../chain/blocks/types.js";
71
74
  import {
72
75
  AttestationError,
73
76
  AttestationErrorCode,
@@ -83,7 +86,11 @@ import {PREPARE_NEXT_SLOT_BPS} from "../../../chain/prepareNextSlot.js";
83
86
  import {BlockType, ProduceFullDeneb, ProduceFullGloas} from "../../../chain/produceBlock/index.js";
84
87
  import {RegenCaller} from "../../../chain/regen/index.js";
85
88
  import {CheckpointHex} from "../../../chain/stateCache/types.js";
86
- import {validateApiAggregateAndProof} from "../../../chain/validation/index.js";
89
+ import {
90
+ InclusionListValidationResult,
91
+ validateApiAggregateAndProof,
92
+ validateGossipInclusionList,
93
+ } from "../../../chain/validation/index.js";
87
94
  import {validateGossipProposerPreferences} from "../../../chain/validation/proposerPreferences.js";
88
95
  import {validateSyncCommitteeGossipContributionAndProof} from "../../../chain/validation/syncCommitteeContributionAndProof.js";
89
96
  import {ZERO_HASH} from "../../../constants/index.js";
@@ -247,13 +254,13 @@ export function getValidatorApi(
247
254
  genesisBlockRoot = state.computeAnchorCheckpoint().checkpoint.root;
248
255
  } else if (state.slot < SLOTS_PER_HISTORICAL_ROOT) {
249
256
  genesisBlockRoot = state.getBlockRootAtSlot(GENESIS_SLOT);
250
- }
251
-
252
- const blockRes = await chain.getCanonicalBlockAtSlot(GENESIS_SLOT);
253
- if (blockRes) {
254
- genesisBlockRoot = config
255
- .getForkTypes(blockRes.block.message.slot)
256
- .SignedBeaconBlock.hashTreeRoot(blockRes.block);
257
+ } else {
258
+ const blockRes = await chain.getCanonicalBlockAtSlot(GENESIS_SLOT);
259
+ if (blockRes) {
260
+ genesisBlockRoot = config
261
+ .getForkTypes(blockRes.block.message.slot)
262
+ .BeaconBlock.hashTreeRoot(blockRes.block.message);
263
+ }
257
264
  }
258
265
  }
259
266
 
@@ -1700,7 +1707,7 @@ export function getValidatorApi(
1700
1707
  }
1701
1708
  }
1702
1709
 
1703
- const dependentRoot = fromHex(state.getShufflingDecisionRoot(epoch)) || (await getGenesisBlockRoot(state));
1710
+ const dependentRoot = fromHex(state.getShufflingDecisionRoot(epoch));
1704
1711
 
1705
1712
  return {
1706
1713
  data: duties,
@@ -1749,7 +1756,7 @@ export function getValidatorApi(
1749
1756
  }
1750
1757
  }
1751
1758
 
1752
- const dependentRoot = fromHex(state.getShufflingDecisionRoot(epoch)) || (await getGenesisBlockRoot(state));
1759
+ const dependentRoot = fromHex(state.getShufflingDecisionRoot(epoch));
1753
1760
 
1754
1761
  return {
1755
1762
  data: duties,
@@ -2198,6 +2205,121 @@ export function getValidatorApi(
2198
2205
  }
2199
2206
  },
2200
2207
 
2208
+ async produceInclusionList({slot}) {
2209
+ notWhileSyncing(chain, sync.state);
2210
+
2211
+ if (!isForkPostHeze(chain.config.getForkName(slot))) {
2212
+ throw new ApiError(400, `Producing inclusion list for pre-heze slot: ${slot}`);
2213
+ }
2214
+
2215
+ await waitForSlot(slot); // Must never request for a future slot > currentSlot
2216
+
2217
+ const timer = metrics?.getInclusionListV1RequestsDuration.startTimer();
2218
+ const transactions = await chain.executionEngine.getInclusionList();
2219
+ timer?.();
2220
+ metrics?.getInclusionListV1Requests.inc();
2221
+
2222
+ return {data: transactions, meta: {version: chain.config.getForkName(slot)}};
2223
+ },
2224
+
2225
+ async getInclusionListCommitteeDuties({epoch, indices}) {
2226
+ notWhileSyncing(chain, sync.state);
2227
+
2228
+ if (indices.length === 0) {
2229
+ throw new ApiError(400, "No validator to get inclusion list committee duties");
2230
+ }
2231
+
2232
+ if (!isForkPostHeze(chain.config.getForkName(computeStartSlotAtEpoch(epoch)))) {
2233
+ throw new ApiError(400, `Requesting pre-heze inclusion list committee duties epoch: ${epoch}`);
2234
+ }
2235
+
2236
+ // May request for an epoch that's in the future
2237
+ await waitForNextClosestEpoch();
2238
+
2239
+ if (epoch > chain.clock.currentEpoch + 1) {
2240
+ throw new ApiError(400, "Cannot get duties for epoch more than one ahead");
2241
+ }
2242
+
2243
+ const head = chain.forkChoice.getHead();
2244
+ const state = await chain.getHeadStateAtCurrentEpoch(RegenCaller.getDuties);
2245
+
2246
+ const pubkeys = getPubkeysForIndices(state, indices);
2247
+ const requestedIndices = new Set(indices);
2248
+ const epochStartSlot = computeStartSlotAtEpoch(epoch);
2249
+ const shuffling = state.getShufflingAtEpoch(epoch);
2250
+
2251
+ // Validators set this as `dependent_root` on their inclusion lists
2252
+ const dependentRoot = fromHex(state.getShufflingDecisionRoot(epoch));
2253
+
2254
+ // A validator can be on several slots' committees in an epoch; report the earliest, as for attester duties
2255
+ const dutySlotByValidator = new Map<ValidatorIndex, Slot>();
2256
+ for (let i = 0; i < SLOTS_PER_EPOCH; i++) {
2257
+ const slot = epochStartSlot + i;
2258
+ for (const validatorIndex of getInclusionListCommittee(shuffling, slot).validatorIndices) {
2259
+ if (requestedIndices.has(validatorIndex) && !dutySlotByValidator.has(validatorIndex)) {
2260
+ dutySlotByValidator.set(validatorIndex, slot);
2261
+ }
2262
+ }
2263
+ }
2264
+
2265
+ const duties: routes.validator.InclusionListDuty[] = [];
2266
+ for (let i = 0; i < indices.length; i++) {
2267
+ const validatorIndex = indices[i];
2268
+ const slot = dutySlotByValidator.get(validatorIndex);
2269
+ if (slot !== undefined) {
2270
+ duties.push({pubkey: pubkeys[i], validatorIndex, slot, dependentRoot});
2271
+ }
2272
+ }
2273
+
2274
+ return {
2275
+ data: duties,
2276
+ meta: {
2277
+ dependentRoot: toRootHex(dependentRoot),
2278
+ executionOptimistic: isOptimisticBlock(head),
2279
+ },
2280
+ };
2281
+ },
2282
+
2283
+ async publishInclusionList({signedInclusionList}) {
2284
+ notWhileSyncing(chain, sync.state);
2285
+
2286
+ const {slot} = signedInclusionList.message;
2287
+ if (!isForkPostHeze(chain.config.getForkName(slot))) {
2288
+ throw new ApiError(400, `Publishing pre-heze inclusion list slot: ${slot}`);
2289
+ }
2290
+
2291
+ // Timeliness is judged on receipt, as for gossip, so a list submitted in time stays timely if validation is slow
2292
+ const secFromSlot = chain.clock.secFromSlot(slot, Date.now() / 1000);
2293
+ metrics?.inclusionListsReceived.inc({source: InclusionListSource.api});
2294
+ metrics?.inclusionListTransactionsReceived.inc(
2295
+ {source: InclusionListSource.api},
2296
+ signedInclusionList.message.transactions.length
2297
+ );
2298
+
2299
+ const timer = metrics?.inclusionListsValidationTime.startTimer();
2300
+ let validationResult: InclusionListValidationResult;
2301
+ try {
2302
+ validationResult = await validateGossipInclusionList(chain, signedInclusionList);
2303
+ } finally {
2304
+ timer?.({source: InclusionListSource.api});
2305
+ }
2306
+ const {committeeIndices, totalBytes} = validationResult;
2307
+ metrics?.inclusionListsValid.inc({source: InclusionListSource.api});
2308
+ metrics?.inclusionListsValidSize.inc(totalBytes);
2309
+
2310
+ const isTimely =
2311
+ secFromSlot >= 0 && secFromSlot * 1000 < chain.config.getInclusionListDueMs(chain.config.getForkName(slot));
2312
+ chain.inclusionListStore.process(signedInclusionList, committeeIndices, isTimely);
2313
+
2314
+ chain.emitter.emit(routes.events.EventType.inclusionList, {
2315
+ version: chain.config.getForkName(slot),
2316
+ data: signedInclusionList,
2317
+ });
2318
+
2319
+ await network.publishInclusionList(signedInclusionList);
2320
+ metrics?.inclusionListsPublished.inc();
2321
+ },
2322
+
2201
2323
  async getExecutionPayloadEnvelope({slot, beaconBlockRoot}) {
2202
2324
  const fork = config.getForkName(slot);
2203
2325
 
@@ -2,6 +2,8 @@ import {BeaconRestApiServerOpts, beaconRestApiServerOpts} from "./rest/index.js"
2
2
 
3
3
  export type ApiOptions = {
4
4
  maxGindicesInProof?: number;
5
+ /** Broadcast execution payload bids submitted via the API without running gossip validation */
6
+ disableBidValidation?: boolean;
5
7
  rest: BeaconRestApiServerOpts;
6
8
  commit?: string;
7
9
  version?: string;
@@ -10,6 +12,7 @@ export type ApiOptions = {
10
12
 
11
13
  export const defaultApiOptions: ApiOptions = {
12
14
  maxGindicesInProof: 512,
15
+ disableBidValidation: false,
13
16
  rest: beaconRestApiServerOpts,
14
17
  version: "dev",
15
18
  private: false,
@@ -1,7 +1,10 @@
1
1
  import {ChainForkConfig} from "@lodestar/config";
2
+ import {NUMBER_OF_COLUMNS} from "@lodestar/params";
3
+ import {RootHex} from "@lodestar/types";
2
4
  import {Logger, sleep} from "@lodestar/utils";
3
5
  import {Metrics} from "../metrics/metrics.js";
4
6
  import {DataColumnReconstructionCode, recoverDataColumnSidecars} from "../util/dataColumns.js";
7
+ import {JobItemQueue} from "../util/queue/index.js";
5
8
  import {BlockInputColumns} from "./blocks/blockInput/index.js";
6
9
  import {PayloadEnvelopeInput} from "./blocks/payloadEnvelopeInput/index.js";
7
10
  import {ChainEventEmitter} from "./emitter.js";
@@ -16,15 +19,22 @@ const RECONSTRUCTION_DELAY_MIN_BPS = 667;
16
19
  */
17
20
  const RECONSTRUCTION_DELAY_MAX_BPS = 1000;
18
21
 
22
+ const QUEUE_MAX_LENGTH = 16;
23
+
24
+ export type ColumnReconstructionInput = BlockInputColumns | PayloadEnvelopeInput;
25
+
19
26
  export type ColumnReconstructionTrackerInit = {
20
27
  logger: Logger;
21
28
  emitter: ChainEventEmitter;
22
29
  metrics: Metrics | null;
23
30
  config: ChainForkConfig;
31
+ signal: AbortSignal;
24
32
  };
25
33
 
26
34
  /**
27
- * Tracks column reconstruction attempts to avoid duplicate and multiple in-flight calls
35
+ * Runs column reconstruction one block root at a time, in trigger order. A trigger for a root that is
36
+ * queued or in flight is a no-op. A root is removed once its attempt finishes so a later column can
37
+ * retry a failed attempt.
28
38
  */
29
39
  export class ColumnReconstructionTracker {
30
40
  logger: Logger;
@@ -32,62 +42,71 @@ export class ColumnReconstructionTracker {
32
42
  metrics: Metrics | null;
33
43
  config: ChainForkConfig;
34
44
 
35
- /**
36
- * Track last attempted block root
37
- *
38
- * This is sufficient to avoid duplicate calls since we only call this
39
- * function when we see a new data column sidecar from gossip.
40
- */
41
- lastBlockRootHex: string | null = null;
42
- /** Track if a reconstruction attempt is in-flight */
43
- running = false;
45
+ private readonly signal: AbortSignal;
46
+ private readonly pending = new Set<RootHex>();
47
+ private readonly queue: JobItemQueue<[ColumnReconstructionInput, number], void>;
44
48
 
45
49
  constructor(init: ColumnReconstructionTrackerInit) {
46
50
  this.logger = init.logger;
47
51
  this.emitter = init.emitter;
48
52
  this.metrics = init.metrics;
49
53
  this.config = init.config;
54
+ this.signal = init.signal;
55
+ this.queue = new JobItemQueue(
56
+ this.reconstruct,
57
+ {maxLength: QUEUE_MAX_LENGTH, signal: init.signal},
58
+ init.metrics?.columnReconstructionQueue
59
+ );
50
60
  }
51
61
 
52
- triggerColumnReconstruction(input: BlockInputColumns | PayloadEnvelopeInput): void {
53
- if (this.running) {
62
+ triggerColumnReconstruction(input: ColumnReconstructionInput): void {
63
+ if (this.pending.has(input.blockRootHex)) {
54
64
  return;
55
65
  }
56
66
 
57
- if (this.lastBlockRootHex === input.blockRootHex) {
67
+ if (input.getAllColumns().length < NUMBER_OF_COLUMNS / 2) {
58
68
  return;
59
69
  }
60
70
 
61
- // We don't care about the outcome of this call,
62
- // just that it has been triggered for this block root.
63
- this.running = true;
64
- this.lastBlockRootHex = input.blockRootHex;
71
+ this.pending.add(input.blockRootHex);
72
+ void this.enqueue(input);
73
+ }
74
+
75
+ private async enqueue(input: ColumnReconstructionInput): Promise<void> {
76
+ try {
77
+ await this.queue.push(input, Date.now());
78
+ } catch (e) {
79
+ this.logger.debug(
80
+ "Data column sidecar reconstruction dropped",
81
+ {slot: input.slot, root: input.blockRootHex},
82
+ e as Error
83
+ );
84
+ } finally {
85
+ this.pending.delete(input.blockRootHex);
86
+ }
87
+ }
88
+
89
+ private reconstruct = async (input: ColumnReconstructionInput, queuedAtMs: number): Promise<void> => {
65
90
  const fork = this.config.getForkName(input.slot);
66
91
  const minDelayMs = this.config.getSlotComponentDurationMs(fork, RECONSTRUCTION_DELAY_MIN_BPS);
67
92
  const maxDelayMs = this.config.getSlotComponentDurationMs(fork, RECONSTRUCTION_DELAY_MAX_BPS);
68
93
  const delay = minDelayMs + Math.random() * (maxDelayMs - minDelayMs);
69
- sleep(delay)
70
- .then(() => {
71
- const logCtx = {slot: input.slot, root: input.blockRootHex};
72
- this.logger.debug("Attempting data column sidecar reconstruction", logCtx);
73
- recoverDataColumnSidecars(input, this.emitter, this.metrics)
74
- .then((result) => {
75
- this.metrics?.recoverDataColumnSidecars.reconstructionResult.inc({result});
76
- this.logger.debug("Data column sidecar reconstruction complete", {...logCtx, result});
77
- })
78
- .catch((e) => {
79
- this.metrics?.recoverDataColumnSidecars.reconstructionResult.inc({
80
- result: DataColumnReconstructionCode.Failed,
81
- });
82
- this.logger.debug("Error during data column sidecar reconstruction", logCtx, e as Error);
83
- })
84
- .finally(() => {
85
- this.logger.debug("Data column sidecar reconstruction attempt finished", logCtx);
86
- this.running = false;
87
- });
88
- })
89
- .catch((err) => {
90
- this.logger.debug("ColumnReconstructionTracker unreachable error", {}, err);
91
- });
92
- }
94
+
95
+ // The delay gives gossip a chance to deliver the remaining columns, so time already spent in the
96
+ // queue behind another root counts towards it
97
+ await sleep(delay - (Date.now() - queuedAtMs), this.signal);
98
+
99
+ const logCtx = {slot: input.slot, root: input.blockRootHex};
100
+ this.logger.debug("Attempting data column sidecar reconstruction", logCtx);
101
+ try {
102
+ const result = await recoverDataColumnSidecars(input, this.emitter, this.metrics);
103
+ this.metrics?.recoverDataColumnSidecars.reconstructionResult.inc({result});
104
+ this.logger.debug("Data column sidecar reconstruction complete", {...logCtx, result});
105
+ } catch (e) {
106
+ this.metrics?.recoverDataColumnSidecars.reconstructionResult.inc({result: DataColumnReconstructionCode.Failed});
107
+ this.logger.debug("Error during data column sidecar reconstruction", logCtx, e as Error);
108
+ } finally {
109
+ this.logger.debug("Data column sidecar reconstruction attempt finished", logCtx);
110
+ }
111
+ };
93
112
  }