@lodestar/beacon-node 1.46.0-dev.d0262e8610 → 1.46.0-dev.d9065a2b16

package/lib/util/sszBytes.js

@@ -549,7 +549,7 @@ export function getBlockRootFromPayloadAttestationMessageSerialized(data) {
  *   blockHash: Bytes32            (32 bytes)
  *   prevRandao: Bytes32           (32 bytes)
  *   feeRecipient: ExecutionAddress(20 bytes)
- *   gasLimit: UintNum64           (8 bytes)
+ *   gasLimit: UintBn64            (8 bytes)
  *   builderIndex: BuilderIndex    (8 bytes)
  *   slot: Slot                    (8 bytes)  ← absolute offset 264
  */

package/package.json

@@ -11,75 +11,65 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.46.0-dev.d0262e8610",
+  "version": "1.46.0-dev.d9065a2b16",
   "type": "module",
   "exports": {
     ".": {
-      "bun": "./src/index.ts",
+      "typescript": "./src/index.ts",
       "types": "./lib/index.d.ts",
       "import": "./lib/index.js"
     },
     "./api": {
-      "bun": "./src/api/index.ts",
+      "typescript": "./src/api/index.ts",
       "types": "./lib/api/index.d.ts",
       "import": "./lib/api/index.js"
     },
     "./chain": {
-      "bun": "./src/chain/index.ts",
+      "typescript": "./src/chain/index.ts",
       "types": "./lib/chain/index.d.ts",
       "import": "./lib/chain/index.js"
     },
     "./constants": {
-      "bun": "./src/constants/index.ts",
+      "typescript": "./src/constants/index.ts",
       "types": "./lib/constants/index.d.ts",
       "import": "./lib/constants/index.js"
     },
     "./db": {
-      "bun": "./src/db/index.ts",
+      "typescript": "./src/db/index.ts",
       "types": "./lib/db/index.d.ts",
       "import": "./lib/db/index.js"
     },
     "./metrics": {
-      "bun": "./src/metrics/index.ts",
+      "typescript": "./src/metrics/index.ts",
       "types": "./lib/metrics/index.d.ts",
       "import": "./lib/metrics/index.js"
     },
     "./monitoring": {
-      "bun": "./src/monitoring/index.ts",
+      "typescript": "./src/monitoring/index.ts",
       "types": "./lib/monitoring/index.d.ts",
       "import": "./lib/monitoring/index.js"
     },
     "./network": {
-      "bun": "./src/network/index.ts",
+      "typescript": "./src/network/index.ts",
       "types": "./lib/network/index.d.ts",
       "import": "./lib/network/index.js"
     },
     "./node": {
-      "bun": "./src/node/index.ts",
+      "typescript": "./src/node/index.ts",
       "types": "./lib/node/index.d.ts",
       "import": "./lib/node/index.js"
     },
     "./sync": {
-      "bun": "./src/sync/index.ts",
+      "typescript": "./src/sync/index.ts",
       "types": "./lib/sync/index.d.ts",
       "import": "./lib/sync/index.js"
     },
     "./util": {
-      "bun": "./src/util/index.ts",
+      "typescript": "./src/util/index.ts",
       "types": "./lib/util/index.d.ts",
       "import": "./lib/util/index.js"
     }
   },
-  "imports": {
-    "#prometheus-gc-stats-wrapper": {
-      "bun": "./src/bun-wrappers/prometheus-gc-stats.ts",
-      "default": "@chainsafe/prometheus-gc-stats"
-    },
-    "#datastore-wrapper": {
-      "bun": "./src/network/peers/datastore_bun.ts",
-      "default": "datastore-level"
-    }
-  },
   "files": [
     "src",
     "lib",
@@ -136,20 +126,19 @@
     "@libp2p/peer-id": "^6.0.4",
     "@libp2p/prometheus-metrics": "^5.0.14",
     "@libp2p/tcp": "^11.0.13",
-    "@lodestar/api": "^1.46.0-dev.d0262e8610",
-    "@lodestar/config": "^1.46.0-dev.d0262e8610",
-    "@lodestar/db": "^1.46.0-dev.d0262e8610",
-    "@lodestar/fork-choice": "^1.46.0-dev.d0262e8610",
-    "@lodestar/logger": "^1.46.0-dev.d0262e8610",
-    "@lodestar/params": "^1.46.0-dev.d0262e8610",
-    "@lodestar/reqresp": "^1.46.0-dev.d0262e8610",
-    "@lodestar/state-transition": "^1.46.0-dev.d0262e8610",
-    "@lodestar/types": "^1.46.0-dev.d0262e8610",
-    "@lodestar/utils": "^1.46.0-dev.d0262e8610",
-    "@lodestar/validator": "^1.46.0-dev.d0262e8610",
+    "@lodestar/api": "^1.46.0-dev.d9065a2b16",
+    "@lodestar/config": "^1.46.0-dev.d9065a2b16",
+    "@lodestar/db": "^1.46.0-dev.d9065a2b16",
+    "@lodestar/fork-choice": "^1.46.0-dev.d9065a2b16",
+    "@lodestar/logger": "^1.46.0-dev.d9065a2b16",
+    "@lodestar/params": "^1.46.0-dev.d9065a2b16",
+    "@lodestar/reqresp": "^1.46.0-dev.d9065a2b16",
+    "@lodestar/state-transition": "^1.46.0-dev.d9065a2b16",
+    "@lodestar/types": "^1.46.0-dev.d9065a2b16",
+    "@lodestar/utils": "^1.46.0-dev.d9065a2b16",
+    "@lodestar/validator": "^1.46.0-dev.d9065a2b16",
     "@multiformats/multiaddr": "^13.0.1",
     "datastore-core": "^11.0.2",
-    "datastore-fs": "^11.0.2",
     "datastore-level": "^12.0.2",
     "deepmerge": "^4.3.1",
     "fastify": "^5.8.1",
@@ -169,7 +158,7 @@
     "@libp2p/interface-internal": "^3.0.13",
     "@libp2p/logger": "^6.2.2",
     "@libp2p/utils": "^7.0.13",
-    "@lodestar/spec-test-util": "^1.46.0-dev.d0262e8610",
+    "@lodestar/spec-test-util": "^1.46.0-dev.d9065a2b16",
     "@types/js-yaml": "^4.0.5",
     "@types/qs": "^6.9.7",
     "@types/tmp": "^0.2.3",
@@ -186,5 +175,5 @@
     "beacon",
     "blockchain"
   ],
-  "gitHead": "35efad014cc61aded49832765a94326bf6bdaa55"
+  "gitHead": "55c3e57de9c6d35ff864b3f60edbd71ef71129db"
 }

package/src/api/impl/config/constants.ts

@@ -12,6 +12,7 @@ import {
   BUILDER_PAYMENT_THRESHOLD_DENOMINATOR,
   BUILDER_PAYMENT_THRESHOLD_NUMERATOR,
   BUILDER_WITHDRAWAL_PREFIX,
+  BYTES_PER_FIELD_ELEMENT,
   COMPOUNDING_WITHDRAWAL_PREFIX,
   CONSOLIDATION_REQUEST_TYPE,
   DEPOSIT_CONTRACT_TREE_DEPTH,
@@ -131,6 +132,7 @@ export const specConstants = {
   // Deneb types
   BLOB_TX_TYPE: toHexByte(BLOB_TX_TYPE),
   VERSIONED_HASH_VERSION_KZG: toHexByte(VERSIONED_HASH_VERSION_KZG),
+  BYTES_PER_FIELD_ELEMENT,
 
   // electra
   UNSET_DEPOSIT_REQUESTS_START_INDEX,

package/src/api/impl/lodestar/index.ts

@@ -32,9 +32,8 @@ export function getLodestarApi({
 }: Pick<ApiModules, "chain" | "config" | "db" | "network" | "sync">): ApplicationMethods<routes.lodestar.Endpoints> {
   let writingHeapdump = false;
   let writingProfile = false;
-  // for NodeJS, profile the whole epoch
-  // for Bun, profile 1 slot. Otherwise it will either crash the app, and/or inspector cannot render the profile
-  const defaultProfileMs = globalThis.Bun ? config.SLOT_DURATION_MS : SLOTS_PER_EPOCH * config.SLOT_DURATION_MS;
+  // profile the whole epoch by default
+  const defaultProfileMs = SLOTS_PER_EPOCH * config.SLOT_DURATION_MS;
 
   return {
     async writeHeapdump({thread = "main", dirpath = "."}) {

package/src/chain/archiveStore/archiveStore.ts

@@ -4,6 +4,7 @@ import {Checkpoint} from "@lodestar/types/phase0";
 import {callFnWhenAwait} from "@lodestar/utils";
 import {IBeaconDb} from "../../db/index.js";
 import {Metrics} from "../../metrics/metrics.js";
+import {callInNextEventLoop} from "../../util/eventLoop.js";
 import {isOptimisticBlock} from "../../util/forkChoice.js";
 import {JobItemQueue, isQueueErrorAborted} from "../../util/queue/index.js";
 import {ChainEvent} from "../emitter.js";
@@ -166,9 +167,25 @@ export class ArchiveStore {
   // Event handlers
   //-------------------------------------------------------------------------
   private onFinalizedCheckpoint = (finalized: CheckpointWithHex): void => {
-    this.jobQueue.push(finalized).catch((e) => {
-      if (!isQueueErrorAborted(e)) {
-        this.logger.error("Error queuing finalized checkpoint", {epoch: finalized.epoch}, e as Error);
+    // Decouple finalized-checkpoint processing from block import. This handler runs synchronously
+    // inside the `ChainEvent.forkChoiceFinalized` emit from `forkChoice.onBlock()` during
+    // `importBlock()`; deferring the work to the next event-loop tick keeps any failure here off the
+    // import call stack, so it can't abort `importBlock()` before `regen.processState()` caches the
+    // head post-state — the deep-sync wedge this PR fixes (#9716).
+    //
+    // `jobQueue.push()` can throw synchronously (queue aborted / full) or reject asynchronously;
+    // awaiting it inside the deferred callback funnels both failure modes into the one catch.
+    callInNextEventLoop(async () => {
+      try {
+        await this.jobQueue.push(finalized);
+      } catch (e) {
+        if (!isQueueErrorAborted(e)) {
+          this.logger.error(
+            "Error queuing finalized checkpoint",
+            {epoch: finalized.epoch, rootHex: finalized.rootHex},
+            e as Error
+          );
+        }
       }
     });
   };

package/src/chain/archiveStore/historicalState/historicalStateRegen.ts

@@ -39,7 +39,6 @@ export class HistoricalStateRegen implements HistoricalStateWorkerApi {
     };
 
     const worker = new Worker(path.join(WORKER_DIR, "worker.js"), {
-      suppressTranspileTS: Boolean(globalThis.Bun),
       workerData,
     } as ConstructorParameters<typeof Worker>[1]);
 

package/src/chain/blocks/verifyExecutionPayloadEnvelope.ts

@@ -61,7 +61,7 @@ export function verifyExecutionPayloadEnvelope(
       `Prev randao mismatch between bid and payload bid=${toHex(bid.prevRandao)} payload=${toHex(payload.prevRandao)}`
     );
   }
-  if (bid.gasLimit !== payload.gasLimit) {
+  if (bid.gasLimit !== BigInt(payload.gasLimit)) {
     throw new Error(`Gas limit mismatch between payload and bid payload=${payload.gasLimit} bid=${bid.gasLimit}`);
   }
   if (!byteArrayEquals(bid.blockHash, payload.blockHash)) {

package/src/chain/bls/multithread/index.ts

@@ -267,7 +267,6 @@ export class BlsMultiThreadWorkerPool implements IBlsVerifier {
     for (let i = 0; i < poolSize; i++) {
       const workerData: WorkerData = {workerId: i};
       const worker = new Worker(path.join(workerDir, "worker.js"), {
-        suppressTranspileTS: Boolean(globalThis.Bun),
         workerData,
       } as ConstructorParameters<typeof Worker>[1]);
 

package/src/chain/chain.ts

@@ -1191,13 +1191,19 @@ export class BeaconChain implements IBeaconChain {
       const prevHead = this.forkChoice.getHead();
       const head = this.forkChoice.updateAndGetHead({mode: UpdateHeadOpt.GetCanonicalHead}).head;
 
-      if (head.blockRoot !== prevHead.blockRoot) {
-        try {
-          const previousDutyDependentRoot = this.forkChoice.getDependentRoot(head, EpochDifference.previous);
-          const currentDutyDependentRoot = this.forkChoice.getDependentRoot(head, EpochDifference.current);
-          const epochTransition = computeStartSlotAtEpoch(computeEpochAtSlot(head.slot)) === head.slot;
-          const executionOptimistic = isOptimisticBlock(head);
+      const headRootChanged = head.blockRoot !== prevHead.blockRoot;
 
+      if (!headRootChanged && prevHead.payloadStatus === head.payloadStatus) {
+        return head;
+      }
+
+      try {
+        const previousDutyDependentRoot = this.forkChoice.getDependentRoot(head, EpochDifference.previous);
+        const currentDutyDependentRoot = this.forkChoice.getDependentRoot(head, EpochDifference.current);
+        const epochTransition = computeStartSlotAtEpoch(computeEpochAtSlot(head.slot)) === head.slot;
+        const executionOptimistic = isOptimisticBlock(head);
+
+        if (headRootChanged) {
           this.emitter.emit(routes.events.EventType.head, {
             block: head.blockRoot,
             epochTransition,
@@ -1207,50 +1213,28 @@ export class BeaconChain implements IBeaconChain {
             currentDutyDependentRoot,
             executionOptimistic,
           });
-
-          this.emitter.emit(routes.events.EventType.headV2, {
-            version: this.config.getForkName(head.slot),
-            data: {
-              slot: head.slot,
-              block: head.blockRoot,
-              state: head.stateRoot,
-              payloadStatus: head.payloadStatus === PayloadStatus.FULL ? "full" : "empty",
-              epochTransition,
-              currentEpochDependentRoot: previousDutyDependentRoot,
-              nextEpochDependentRoot: currentDutyDependentRoot,
-              executionOptimistic,
-            },
-          });
-        } catch (e) {
-          // getDependentRoot() may fail with error: "No block for root" as we can see in holesky non-finality issue
-          this.logger.debug("Error emitting head/head_v2 event", {slot: head.slot, root: head.blockRoot}, e as Error);
-        }
-      } else if (
-        (prevHead.payloadStatus !== PayloadStatus.FULL && head.payloadStatus === PayloadStatus.FULL) ||
-        (prevHead.payloadStatus !== PayloadStatus.EMPTY && head.payloadStatus === PayloadStatus.EMPTY)
-      ) {
-        // Implies that block root is the same, emits on payload status change empty -> full or full -> empty.
-        try {
-          this.emitter.emit(routes.events.EventType.headV2, {
-            version: this.config.getForkName(head.slot),
-            data: {
-              slot: head.slot,
-              block: head.blockRoot,
-              state: head.stateRoot,
-              payloadStatus: head.payloadStatus === PayloadStatus.EMPTY ? "empty" : "full",
-              epochTransition: computeStartSlotAtEpoch(computeEpochAtSlot(head.slot)) === head.slot,
-              currentEpochDependentRoot: this.forkChoice.getDependentRoot(head, EpochDifference.previous),
-              nextEpochDependentRoot: this.forkChoice.getDependentRoot(head, EpochDifference.current),
-              executionOptimistic: isOptimisticBlock(head),
-            },
-          });
-        } catch (e) {
-          this.logger.debug(
-            "Error emitting head_v2 event on payload status change",
-            {slot: head.slot, root: head.blockRoot},
-            e as Error
-          );
         }
+
+        this.emitter.emit(routes.events.EventType.headV2, {
+          version: this.config.getForkName(head.slot),
+          data: {
+            slot: head.slot,
+            block: head.blockRoot,
+            state: head.stateRoot,
+            payloadStatus: head.payloadStatus === PayloadStatus.FULL ? "full" : "empty",
+            epochTransition,
+            currentEpochDependentRoot: previousDutyDependentRoot,
+            nextEpochDependentRoot: currentDutyDependentRoot,
+            executionOptimistic,
+          },
+        });
+      } catch (e) {
+        // getDependentRoot() may fail with error: "No block for root" as we can see in holesky non-finality issue
+        this.logger.debug(
+          "Error emitting head/head_v2 event",
+          {slot: head.slot, root: head.blockRoot, headRootChanged},
+          e as Error
+        );
       }
 
       return head;

package/src/chain/opPools/aggregatedAttestationPool.ts

@@ -234,6 +234,7 @@ export class AggregatedAttestationPool {
     const stateEpoch = state.epoch;
     const statePrevEpoch = stateEpoch - 1;
     const rootCache = new RootCache(state);
+    const gloasState = isStatePostGloas(state) ? state : null;
 
     const notSeenValidatorsFn = getNotSeenValidatorsFn(this.config, shufflingCache, state);
     const validateAttestationDataFn = getValidateAttestationDataFn(forkChoice, state);
@@ -361,7 +362,8 @@ export class AggregatedAttestationPool {
             inclusionDistance,
             stateEpoch,
             rootCache,
-            isStatePostGloas(state) ? state.executionPayloadAvailability : null
+            gloasState?.executionPayloadAvailability ?? null,
+            gloasState?.latestExecutionPayloadBid.slot ?? null
           );
 
           const weight =

package/src/chain/produceBlock/produceBlockBody.ts

@@ -345,7 +345,7 @@ export async function produceBlockBody<T extends BlockType>(
       blockHash: executionPayload.blockHash,
       prevRandao: currentState.getRandaoMix(currentState.epoch),
       feeRecipient: executionPayload.feeRecipient,
-      gasLimit: executionPayload.gasLimit,
+      gasLimit: BigInt(executionPayload.gasLimit),
       builderIndex: BUILDER_INDEX_SELF_BUILD,
       slot: blockSlot,
       value: 0,

package/src/chain/validation/blobSidecar.ts

@@ -111,7 +111,7 @@ export async function validateGossipBlobSidecar(
 
   // [REJECT] The blob is from a higher slot than its parent.
   if (parentBlock.slot >= blobSlot) {
-    throw new BlobSidecarGossipError(GossipAction.IGNORE, {
+    throw new BlobSidecarGossipError(GossipAction.REJECT, {
       code: BlobSidecarErrorCode.NOT_LATER_THAN_PARENT,
       parentSlot: parentBlock.slot,
       slot: blobSlot,

package/src/chain/validation/executionPayloadBid.ts

@@ -219,7 +219,7 @@ async function validateExecutionPayloadBid(
   // [IGNORE] `is_gas_limit_target_compatible(parent_gas_limit, bid.gas_limit, target_gas_limit)`,
   // where `parent_gas_limit` is the `gas_limit` of the parent execution payload and
   // `target_gas_limit` is `proposer_preferences.target_gas_limit`.
-  const bidGasLimit = bid.gasLimit;
+  const bidGasLimit = Number(bid.gasLimit);
   const parentGasLimit = parentPayloadVariant.executionPayloadGasLimit;
   const targetGasLimit = proposerPreferences.message.targetGasLimit;
   if (!isGasLimitTargetCompatible(parentGasLimit, bidGasLimit, targetGasLimit)) {

package/src/chain/validation/proposerPreferences.ts

@@ -1,5 +1,5 @@
 import {IForkChoice, ProtoBlock} from "@lodestar/fork-choice";
-import {GENESIS_SLOT, MIN_SEED_LOOKAHEAD, SLOTS_PER_EPOCH} from "@lodestar/params";
+import {GENESIS_EPOCH, GENESIS_SLOT, MIN_SEED_LOOKAHEAD, SLOTS_PER_EPOCH} from "@lodestar/params";
 import {
   computeEpochAtSlot,
   computeStartSlotAtEpoch,
@@ -24,9 +24,10 @@ export async function validateGossipProposerPreferences(
   const dependentRootHex = toRootHex(dependentRoot);
   const proposalEpoch = computeEpochAtSlot(proposalSlot);
 
-  // [IGNORE] `preferences.proposal_slot` is within the proposer lookahead.
-  const currentEpoch = chain.clock.currentEpoch;
-  if (proposalEpoch < currentEpoch || proposalEpoch > currentEpoch + MIN_SEED_LOOKAHEAD) {
+  // [IGNORE] `preferences.proposal_slot` is within the proposer lookahead,
+  // allowing for `MAXIMUM_GOSSIP_CLOCK_DISPARITY`.
+  const currentEpoch = computeEpochAtSlot(chain.clock.currentSlotWithGossipDisparity);
+  if (proposalEpoch > currentEpoch + MIN_SEED_LOOKAHEAD) {
     throw new ProposerPreferencesError(GossipAction.IGNORE, {
       code: ProposerPreferencesErrorCode.INVALID_EPOCH,
       proposalSlot,
@@ -36,12 +37,11 @@ export async function validateGossipProposerPreferences(
 
   // [IGNORE] `preferences.proposal_slot` has not already passed, i.e. `proposal_slot > current_slot`,
   // allowing for `MAXIMUM_GOSSIP_CLOCK_DISPARITY`.
-  const currentSlot = chain.clock.currentSlotWithGossipDisparity;
-  if (proposalSlot <= currentSlot) {
+  if (chain.clock.msFromSlot(proposalSlot) > chain.config.MAXIMUM_GOSSIP_CLOCK_DISPARITY) {
     throw new ProposerPreferencesError(GossipAction.IGNORE, {
       code: ProposerPreferencesErrorCode.PROPOSAL_SLOT_PASSED,
       proposalSlot,
-      currentSlot,
+      currentSlot: chain.clock.currentSlot,
     });
   }
 
@@ -55,7 +55,7 @@ export async function validateGossipProposerPreferences(
     });
   }
 
-  const dependentEpoch = proposalEpoch - MIN_SEED_LOOKAHEAD;
+  const dependentEpoch = Math.max(GENESIS_EPOCH, proposalEpoch - MIN_SEED_LOOKAHEAD);
   const dependentRootSlot = getDependentRootSlot(dependentEpoch);
 
   // [REJECT] The slot of the block with root `preferences.dependent_root` is strictly less than

package/src/chain/validatorMonitor.ts

@@ -469,7 +469,7 @@ export function createValidatorMonitor(
         proposerIndex,
         src,
         builderIndex: bid.builderIndex,
-        gasLimit: bid.gasLimit,
+        gasLimit: Number(bid.gasLimit),
         value: bid.value.toString(),
         parentBlockRoot: toRootHex(bid.parentBlockRoot),
         parentBlockHash: toRootHex(bid.parentBlockHash),

package/src/metrics/nodeJsMetrics.ts

@@ -1,5 +1,5 @@
 import {Registry, collectDefaultMetrics} from "prom-client";
-import {gcStats} from "#prometheus-gc-stats-wrapper";
+import {gcStats} from "@chainsafe/prometheus-gc-stats";
 
 export function collectNodeJSMetrics(register: Registry, prefix?: string): () => void {
   collectDefaultMetrics({

package/src/network/core/networkCoreWorkerHandler.ts

@@ -132,10 +132,6 @@ export class WorkerNetworkCore implements INetworkCore {
 
     const workerOpts: ConstructorParameters<typeof Worker>[1] = {
       workerData,
-    };
-    if (globalThis.Bun) {
-      workerOpts.suppressTranspileTS = true;
-    } else {
       /**
        * maxYoungGenerationSizeMb defaults to 152mb through the cli option defaults.
        * That default value was determined via https://github.com/ChainSafe/lodestar/issues/2115 and
@@ -147,8 +143,8 @@ export class WorkerNetworkCore implements INetworkCore {
        * showed that there is a pretty big window of "correct" values but we can always tune as
        * necessary
        */
-      workerOpts.resourceLimits = {maxYoungGenerationSizeMb: opts.maxYoungGenerationSizeMb};
-    }
+      resourceLimits: {maxYoungGenerationSizeMb: opts.maxYoungGenerationSizeMb},
+    };
 
     const worker = new Worker(path.join(workerDir, "networkCoreWorker.js"), workerOpts);
 

package/src/network/discv5/index.ts

@@ -51,10 +51,7 @@ export class Discv5Worker extends (EventEmitter as {new (): StrictEventEmitter<E
       loggerOpts: opts.logger.toOpts(),
       genesisTime: opts.genesisTime,
     };
-    const worker = new Worker("./worker.js", {
-      suppressTranspileTS: Boolean(globalThis.Bun),
-      workerData,
-    } as ConstructorParameters<typeof Worker>[1]);
+    const worker = new Worker("./worker.js", {workerData} as ConstructorParameters<typeof Worker>[1]);
 
     const workerApi = await spawn<Discv5WorkerApi>(worker, {
       // A Lodestar Node may do very expensive task at start blocking the event loop and causing

package/src/network/libp2p/index.ts

@@ -9,7 +9,7 @@ import {Libp2pInit, createLibp2p} from "libp2p";
 import {Registry} from "prom-client";
 import {ENR} from "@chainsafe/enr";
 import {noise} from "@chainsafe/libp2p-noise";
-import {asCrypto, defaultCrypto} from "@chainsafe/libp2p-noise/crypto";
+import {defaultCrypto} from "@chainsafe/libp2p-noise/crypto";
 import {quic} from "@chainsafe/libp2p-quic";
 import {Libp2p, LodestarComponents} from "../interface.js";
 import {NetworkOptions, defaultNetworkOptions} from "../options.js";
@@ -111,14 +111,6 @@ export async function createNodeJsLibp2p(
     }
   }
 
-  const noiseCrypto = {
-    ...defaultCrypto,
-  };
-  if (globalThis.Bun) {
-    noiseCrypto.chaCha20Poly1305Decrypt = asCrypto.chaCha20Poly1305Decrypt;
-    noiseCrypto.chaCha20Poly1305Encrypt = asCrypto.chaCha20Poly1305Encrypt;
-  }
-
   return createLibp2p({
     privateKey,
     nodeInfo: {
@@ -130,7 +122,7 @@ export async function createNodeJsLibp2p(
       listen: localMultiaddrs,
       announce: [],
     },
-    connectionEncrypters: [noise({crypto: noiseCrypto})],
+    connectionEncrypters: [noise({crypto: defaultCrypto})],
     transports,
     streamMuxers: [mplex({disconnectThreshold})],
     peerDiscovery,

package/src/network/peers/datastore.ts

@@ -1,7 +1,7 @@
 import {AbortOptions} from "@libp2p/interface";
 import {BaseDatastore} from "datastore-core";
+import {LevelDatastore} from "datastore-level";
 import {Key, KeyQuery, Pair, Query} from "interface-datastore";
-import {LevelDatastore} from "#datastore-wrapper";
 
 type MemoryItem = {
   lastAccessedMs: number;

package/src/util/profile.ts

@@ -8,21 +8,10 @@ export enum ProfileThread {
   DISC5 = "discv5",
 }
 
-/**
- * The time to take a Bun profile.
- * If we increase this time it'll potentiall cause the app to crash.
- * If we decrease this time, profile recorded will be fragmented and hard to analyze.
- */
-const BUN_PROFILE_MS = 3 * 1000;
-
-export async function profileThread(thread: ProfileThread, durationMs: number, dirpath: string): Promise<string> {
-  return globalThis.Bun ? profileBun(thread, durationMs) : profileNodeJS(thread, durationMs, dirpath);
-}
-
 /**
  * Take `durationMs` profile of the current thread and return the persisted file path.
  */
-async function profileNodeJS(thread: ProfileThread, durationMs: number, dirpath: string): Promise<string> {
+export async function profileThread(thread: ProfileThread, durationMs: number, dirpath: string): Promise<string> {
   const inspector = await import("node:inspector");
 
   // due to some typing issues, not able to use promisify here
@@ -54,25 +43,6 @@ async function profileNodeJS(thread: ProfileThread, durationMs: number, dirpath:
   return filePath;
 }
 
-/**
- * Unlike NodeJS, Bun console.profile() api flush data to the inspector,
- * so this api returns ms taken of this profile instead of file path.
- */
-async function profileBun(thread: ProfileThread, durationMs: number): Promise<string> {
-  const start = Date.now();
-  let now = Date.now();
-  while (now - start < durationMs) {
-    // biome-ignore lint/suspicious/noConsole: need to use console api to profile in Bun
-    console.profile(String(now));
-    await sleep(BUN_PROFILE_MS);
-    // biome-ignore lint/suspicious/noConsole: need to use console api to profile in Bun
-    console.profileEnd(String(now));
-    now = Date.now();
-  }
-
-  return `Successfully take Bun ${thread} thread profile in ${now - start}ms. Check your inspector to see the profile.`;
-}
-
 /**
  * Write heap snapshot of the current thread to the specified file.
  */

package/src/util/sszBytes.ts

@@ -706,7 +706,7 @@ export function getBlockRootFromPayloadAttestationMessageSerialized(data: Uint8A
  *   blockHash: Bytes32            (32 bytes)
  *   prevRandao: Bytes32           (32 bytes)
  *   feeRecipient: ExecutionAddress(20 bytes)
- *   gasLimit: UintNum64           (8 bytes)
+ *   gasLimit: UintBn64            (8 bytes)
  *   builderIndex: BuilderIndex    (8 bytes)
  *   slot: Slot                    (8 bytes)  ← absolute offset 264
  */

package/lib/bun-wrappers/prometheus-gc-stats.d.ts

@@ -1,2 +0,0 @@
-export declare function gcStats(): () => void;
-//# sourceMappingURL=prometheus-gc-stats.d.ts.map

package/lib/bun-wrappers/prometheus-gc-stats.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"prometheus-gc-stats.d.ts","sourceRoot":"","sources":["../../src/bun-wrappers/prometheus-gc-stats.ts"],"names":[],"mappings":"AAIA,wBAAgB,OAAO,eAEtB"}

package/lib/bun-wrappers/prometheus-gc-stats.js

@@ -1,8 +0,0 @@
-// Bun does not support `GCProfiler` from `node:v8`a
-// Which is exposed from `@chainsafe/prometheus-gc-stats` and used in `packages/beacon-node/src/metrics/nodeJsMetrics.ts`
-// So we expose a dummy function for Bun runtime which do nothing for now
-// TODO: May look get some useful data from `bun:jsc`
-export function gcStats() {
-    return () => { };
-}
-//# sourceMappingURL=prometheus-gc-stats.js.map

package/lib/bun-wrappers/prometheus-gc-stats.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"prometheus-gc-stats.js","sourceRoot":"","sources":["../../src/bun-wrappers/prometheus-gc-stats.ts"],"names":[],"mappings":"AAAA,oDAAoD;AACpD,yHAAyH;AACzH,yEAAyE;AACzE,qDAAqD;AACrD,MAAM,UAAU,OAAO,GAAG;IACxB,OAAO,GAAG,EAAE,CAAC,EAAC,CAAC,CAAC;AAAA,CACjB"}

package/lib/network/peers/datastore_bun.d.ts

@@ -1,3 +0,0 @@
-import { FsDatastore } from "datastore-fs";
-export declare const LevelDatastore: typeof FsDatastore;
-//# sourceMappingURL=datastore_bun.d.ts.map

package/lib/network/peers/datastore_bun.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"datastore_bun.d.ts","sourceRoot":"","sources":["../../../src/network/peers/datastore_bun.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,cAAc,CAAC;AAEzC,eAAO,MAAM,cAAc,oBAAc,CAAC"}

package/lib/network/peers/datastore_bun.js

@@ -1,3 +0,0 @@
-import { FsDatastore } from "datastore-fs";
-export const LevelDatastore = FsDatastore;
-//# sourceMappingURL=datastore_bun.js.map

package/lib/network/peers/datastore_bun.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"datastore_bun.js","sourceRoot":"","sources":["../../../src/network/peers/datastore_bun.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,cAAc,CAAC;AAEzC,MAAM,CAAC,MAAM,cAAc,GAAG,WAAW,CAAC"}

package/src/bun-wrappers/prometheus-gc-stats.ts

@@ -1,7 +0,0 @@
-// Bun does not support `GCProfiler` from `node:v8`a
-// Which is exposed from `@chainsafe/prometheus-gc-stats` and used in `packages/beacon-node/src/metrics/nodeJsMetrics.ts`
-// So we expose a dummy function for Bun runtime which do nothing for now
-// TODO: May look get some useful data from `bun:jsc`
-export function gcStats() {
-  return () => {};
-}