Merge 810f4a5 into 3859741

.github/workflows/benchmark.yml

@@ -33,7 +33,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 22
+          node-version: 22.4
           check-latest: true
           cache: yarn
       - name: Node.js version

.github/workflows/binaries.yml

@@ -42,7 +42,7 @@ jobs:
           sudo apt-get install -y build-essential python3
       - uses: "./.github/actions/setup-and-build"
         with:
-          node: 22
+          node: 22.4
       - run: |
           mkdir -p dist
           yarn global add caxa@3.0.1

.github/workflows/docs-check.yml

@@ -15,8 +15,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 22
-          cache: yarn          
+          node-version: 22.4
+          cache: yarn
       - name: Node.js version
         id: node
         run: echo "v8CppApiVersion=$(node --print "process.versions.modules")" >> $GITHUB_OUTPUT

.github/workflows/docs.yml

@@ -7,9 +7,9 @@ on:
   workflow_dispatch:
     inputs:
       ref:
-        description: 'Ref to deploy, defaults to `unstable`'
+        description: "Ref to deploy, defaults to `unstable`"
         required: false
-        default: 'unstable'
+        default: "unstable"
         type: string
 
 jobs:
@@ -31,9 +31,9 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 22
+          node-version: 22.4
           check-latest: true
-          cache: yarn          
+          cache: yarn
 
       - name: Node.js version
         id: node

.github/workflows/publish-dev.yml

@@ -20,10 +20,10 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v4
         with:
-          node-version: 22
+          node-version: 22.4
           registry-url: "https://registry.npmjs.org"
           check-latest: true
-          cache: yarn          
+          cache: yarn
       - name: Node.js version
         id: node
         run: echo "v8CppApiVersion=$(node --print "process.versions.modules")" >> $GITHUB_OUTPUT

.github/workflows/publish-rc.yml

@@ -61,7 +61,7 @@ jobs:
 
       - uses: "./.github/actions/setup-and-build"
         with:
-          node: 22
+          node: 22.4
 
       - name: Generate changelog
         run: node scripts/generate_changelog.mjs ${{ needs.tag.outputs.prev_tag }} ${{ needs.tag.outputs.tag }} CHANGELOG.md

.github/workflows/publish-stable.yml

@@ -67,7 +67,7 @@ jobs:
 
       - uses: "./.github/actions/setup-and-build"
         with:
-          node: 22
+          node: 22.4
 
       - name: Generate changelog
         run: node scripts/generate_changelog.mjs ${{ needs.tag.outputs.prev_tag }} ${{ needs.tag.outputs.tag }} CHANGELOG.md

.github/workflows/test-sim-merge.yml

@@ -30,7 +30,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 22
+          node-version: 22.4
           check-latest: true
           cache: yarn
       - name: Node.js version

.github/workflows/test-sim.yml

@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: "./.github/actions/setup-and-build"
         with:
-          node: 22
+          node: 22.4
 
   sim-test-multifork:
     name: Multifork sim test
@@ -42,7 +42,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: "./.github/actions/setup-and-build"
         with:
-          node: 22
+          node: 22.4
       - name: Load env variables
         uses: ./.github/actions/dotenv
       - name: Download required docker images before running tests
@@ -71,7 +71,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: "./.github/actions/setup-and-build"
         with:
-          node: 22
+          node: 22.4
       - name: Load env variables
         uses: ./.github/actions/dotenv
       - name: Download required docker images before running tests
@@ -100,7 +100,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: "./.github/actions/setup-and-build"
         with:
-          node: 22
+          node: 22.4
       - name: Load env variables
         uses: ./.github/actions/dotenv
       - name: Download required docker images before running tests
@@ -129,7 +129,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: "./.github/actions/setup-and-build"
         with:
-          node: 22
+          node: 22.4
       - name: Load env variables
         uses: ./.github/actions/dotenv
       - name: Download required docker images before running tests
@@ -158,7 +158,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: "./.github/actions/setup-and-build"
         with:
-          node: 22
+          node: 22.4
       - name: Load env variables
         uses: ./.github/actions/dotenv
       - name: Download required docker images before running tests

.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [22]
+        node: [22.4]
     steps:
       # <common-build> - Uses YAML anchors in the future
       - uses: actions/checkout@v4
@@ -42,7 +42,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [22]
+        node: [22.4]
     steps:
       - uses: actions/checkout@v4
       - uses: "./.github/actions/setup-and-build"
@@ -74,7 +74,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [22]
+        node: [22.4]
     steps:
       - uses: actions/checkout@v4
 
@@ -95,7 +95,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [22]
+        node: [22.4]
     steps:
       - uses: actions/checkout@v4
       - uses: "./.github/actions/setup-and-build"
@@ -134,7 +134,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [22]
+        node: [22.4]
     steps:
       # <common-build> - Uses YAML anchors in the future
       - uses: actions/checkout@v4
@@ -171,7 +171,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [22]
+        node: [22.4]
     steps:
       # <common-build> - Uses YAML anchors in the future
       - uses: actions/checkout@v4
@@ -195,7 +195,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [22]
+        node: [22.4]
     steps:
       - uses: actions/checkout@v4
       - uses: "./.github/actions/setup-and-build"

Dockerfile

@@ -1,7 +1,7 @@
 
 # --platform=$BUILDPLATFORM is used build javascript source with host arch
 # Otherwise TS builds on emulated archs and can be extremely slow (+1h)
-FROM --platform=${BUILDPLATFORM:-amd64} node:22-alpine as build_src
+FROM --platform=${BUILDPLATFORM:-amd64} node:22.4-alpine as build_src
 ARG COMMIT
 WORKDIR /usr/app
 RUN apk update && apk add --no-cache g++ make python3 py3-setuptools && rm -rf /var/cache/apk/*
@@ -21,7 +21,7 @@ RUN cd packages/cli && GIT_COMMIT=${COMMIT} yarn write-git-data
 
 # Copy built src + node_modules to build native packages for archs different than host.
 # Note: This step is redundant for the host arch
-FROM node:22-alpine as build_deps
+FROM node:22.4-alpine as build_deps
 WORKDIR /usr/app
 RUN apk update && apk add --no-cache g++ make python3 py3-setuptools && rm -rf /var/cache/apk/*
 
@@ -35,7 +35,7 @@ RUN cd node_modules/classic-level && yarn rebuild
 
 # Copy built src + node_modules to a new layer to prune unnecessary fs
 # Previous layer weights 7.25GB, while this final 488MB (as of Oct 2020)
-FROM node:22-alpine
+FROM node:22.4-alpine
 WORKDIR /usr/app
 COPY --from=build_deps /usr/app .
 

lerna.json

@@ -4,7 +4,7 @@
   ],
   "npmClient": "yarn",
   "useNx": true,
-  "version": "1.20.1",
+  "version": "1.20.2",
   "stream": true,
   "command": {
     "version": {

package.json

@@ -2,7 +2,7 @@
   "name": "root",
   "private": true,
   "engines": {
-    "node": ">=20.1.0 <21 || >=22 <23"
+    "node": ">=20.1.0 <21 || >=22 <22.5"
   },
   "packageManager": "yarn@1.22.22+sha256.c17d3797fb9a9115bf375e31bfd30058cac6bc9c3b8807a3d8cb2094794b51ca",
   "workspaces": [

packages/api/package.json

@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.20.1",
+  "version": "1.20.2",
   "type": "module",
   "exports": {
     ".": {
@@ -72,10 +72,10 @@
   "dependencies": {
     "@chainsafe/persistent-merkle-tree": "^0.7.1",
     "@chainsafe/ssz": "^0.15.1",
-    "@lodestar/config": "^1.20.1",
-    "@lodestar/params": "^1.20.1",
-    "@lodestar/types": "^1.20.1",
-    "@lodestar/utils": "^1.20.1",
+    "@lodestar/config": "^1.20.2",
+    "@lodestar/params": "^1.20.2",
+    "@lodestar/types": "^1.20.2",
+    "@lodestar/utils": "^1.20.2",
     "eventsource": "^2.0.2",
     "qs": "^6.11.1"
   },

packages/api/src/beacon/routes/beacon/block.ts

@@ -444,7 +444,16 @@ export function getDefinitions(config: ChainForkConfig): RouteDefinitions<Endpoi
           };
         },
         parseReqJson: ({body, headers}) => {
-          const fork = toForkName(fromHeaders(headers, MetaHeader.Version));
+          let fork: ForkName;
+          // As per spec, version header is optional for JSON requests
+          const versionHeader = fromHeaders(headers, MetaHeader.Version, false);
+          if (versionHeader !== undefined) {
+            fork = toForkName(versionHeader);
+          } else {
+            // Determine fork from slot in JSON payload
+            fork = config.getForkName((body as SignedBlindedBeaconBlock).message.slot);
+          }
+
           return {
             signedBlindedBlock: getExecutionForkTypes(fork).SignedBlindedBeaconBlock.fromJson(body),
           };

packages/beacon-node/package.json

@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.20.1",
+  "version": "1.20.2",
   "type": "module",
   "exports": {
     ".": {
@@ -120,18 +120,18 @@
     "@libp2p/peer-id-factory": "^4.1.0",
     "@libp2p/prometheus-metrics": "^3.0.21",
     "@libp2p/tcp": "9.0.23",
-    "@lodestar/api": "^1.20.1",
-    "@lodestar/config": "^1.20.1",
-    "@lodestar/db": "^1.20.1",
-    "@lodestar/fork-choice": "^1.20.1",
-    "@lodestar/light-client": "^1.20.1",
-    "@lodestar/logger": "^1.20.1",
-    "@lodestar/params": "^1.20.1",
-    "@lodestar/reqresp": "^1.20.1",
-    "@lodestar/state-transition": "^1.20.1",
-    "@lodestar/types": "^1.20.1",
-    "@lodestar/utils": "^1.20.1",
-    "@lodestar/validator": "^1.20.1",
+    "@lodestar/api": "^1.20.2",
+    "@lodestar/config": "^1.20.2",
+    "@lodestar/db": "^1.20.2",
+    "@lodestar/fork-choice": "^1.20.2",
+    "@lodestar/light-client": "^1.20.2",
+    "@lodestar/logger": "^1.20.2",
+    "@lodestar/params": "^1.20.2",
+    "@lodestar/reqresp": "^1.20.2",
+    "@lodestar/state-transition": "^1.20.2",
+    "@lodestar/types": "^1.20.2",
+    "@lodestar/utils": "^1.20.2",
+    "@lodestar/validator": "^1.20.2",
     "@multiformats/multiaddr": "^12.1.3",
     "c-kzg": "^2.1.2",
     "datastore-core": "^9.1.1",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chainsafe/lodestar",
-  "version": "1.20.1",
+  "version": "1.20.2",
   "description": "Command line interface for lodestar",
   "author": "ChainSafe Systems",
   "license": "LGPL-3.0",
@@ -63,17 +63,17 @@
     "@libp2p/crypto": "^4.1.0",
     "@libp2p/peer-id": "^4.1.0",
     "@libp2p/peer-id-factory": "^4.1.0",
-    "@lodestar/api": "^1.20.1",
-    "@lodestar/beacon-node": "^1.20.1",
-    "@lodestar/config": "^1.20.1",
-    "@lodestar/db": "^1.20.1",
-    "@lodestar/light-client": "^1.20.1",
-    "@lodestar/logger": "^1.20.1",
-    "@lodestar/params": "^1.20.1",
-    "@lodestar/state-transition": "^1.20.1",
-    "@lodestar/types": "^1.20.1",
-    "@lodestar/utils": "^1.20.1",
-    "@lodestar/validator": "^1.20.1",
+    "@lodestar/api": "^1.20.2",
+    "@lodestar/beacon-node": "^1.20.2",
+    "@lodestar/config": "^1.20.2",
+    "@lodestar/db": "^1.20.2",
+    "@lodestar/light-client": "^1.20.2",
+    "@lodestar/logger": "^1.20.2",
+    "@lodestar/params": "^1.20.2",
+    "@lodestar/state-transition": "^1.20.2",
+    "@lodestar/types": "^1.20.2",
+    "@lodestar/utils": "^1.20.2",
+    "@lodestar/validator": "^1.20.2",
     "@multiformats/multiaddr": "^12.1.3",
     "deepmerge": "^4.3.1",
     "ethers": "^6.7.0",
@@ -89,7 +89,7 @@
     "yargs": "^17.7.1"
   },
   "devDependencies": {
-    "@lodestar/test-utils": "^1.20.1",
+    "@lodestar/test-utils": "^1.20.2",
     "@types/debug": "^4.1.7",
     "@types/got": "^9.6.12",
     "@types/inquirer": "^9.0.3",