monorepo: migrate to pnpm

.github/workflows/binarytree-build.yml

@@ -10,47 +10,43 @@ on:
       dep-cache-key:
         required: false
         default: 'none'
-      submodule-cache-key:
-        required: false
-        default: 'none'
-
-env:
-  cwd: ${{github.workspace}}/packages/binarytree
-
-defaults:
-  run:
-    working-directory: packages/binarytree
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-binarytree
   cancel-in-progress: true
 
+env:
+  CI: true
+
 jobs:
   test-binarytree:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
-      # We clone the repo and submodules if triggered from work-flow dispatch
-      - if: inputs.submodule-cache-key == 'none'
-        uses: actions/checkout@v4
-
-      # We restore the code/deps from cache if triggered from workflow_call (i.e. have valid cache key)
-      - if: inputs.dep-cache-key != 'none'
-        uses: actions/cache/restore@v4
-        id: dep-cache
+      - name: Checkout repository
+        uses: actions/checkout@v5
         with:
-          path: ${{github.workspace}}
-          key: ${{ inputs.dep-cache-key }}
+          submodules: recursive
 
-      - name: Use Node.js 20
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          run_install: false
+
+      - name: Setup Node.js (restore pnpm cache)
         uses: actions/setup-node@v5
         with:
           node-version: 20
-          cache: 'npm'
+          cache: pnpm
+          cache-dependency-path: pnpm-lock.yaml
+
+      - name: Prefetch deps
+        run: pnpm fetch --frozen-lockfile
 
-      - name: Install Dependencies (if not restored from cache)
-        if: steps.dep-cache.outputs.cache-hit != 'true'
-        run: npm ci
+      - name: Install dependencies (workspace root)
         working-directory: ${{ github.workspace }}
+        run: pnpm install --frozen-lockfile --ignore-scripts --prefer-offline
 
-      - run: npm run test
+      - name: Test @ethereumjs/binarytree
+        working-directory: ${{ github.workspace }}/packages/binarytree
+        run: pnpm run test

.github/workflows/block-build.yml

@@ -1,3 +1,4 @@
+# .github/workflows/block-build.yml
 name: Block
 on:
   workflow_call:
@@ -6,8 +7,8 @@ on:
         required: true
         type: string
       submodule-cache-key:
-          required: true
-          type: string
+        required: false
+        type: string
   workflow_dispatch:
     inputs:
       dep-cache-key:
@@ -17,58 +18,56 @@ on:
         required: false
         default: 'none'
 
-env:
-  cwd: ${{github.workspace}}/packages/block
-
-defaults:
-  run:
-    working-directory: packages/block
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-block
   cancel-in-progress: true
 
+env:
+  CI: true
+
 jobs:
   test-block:
-    runs-on: ubuntu-latest
-    steps:     
-      # We clone the repo and submodules if triggered from work-flow dispatch
-      - if: inputs.submodule-cache-key == 'none'
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout repository
         uses: actions/checkout@v5
         with:
           submodules: recursive
 
-      # We restore the code/deps from cache if triggered from workflow_call (i.e. have valid cache key)
-      - if: inputs.dep-cache-key != 'none' 
-        uses: actions/cache/restore@v4
-        id: dep-cache
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
         with:
-          path: ${{github.workspace}}
-          key: ${{ inputs.dep-cache-key }}
-
-      - name: Use Node.js 20
+          run_install: false
+
+      - name: Setup Node.js (restore pnpm cache)
         uses: actions/setup-node@v5
         with:
           node-version: 20
-          cache: 'npm'
+          cache: pnpm
+          cache-dependency-path: pnpm-lock.yaml
 
-      - name: Install Dependencies (if called from workflow_dispatch)
-        if: steps.dep-cache.outputs.cache-hit != 'true'
-        run: npm ci     
+      - name: Prefetch deps
+        run: pnpm fetch --frozen-lockfile
+
+      - name: Install dependencies (workspace root)
         working-directory: ${{ github.workspace }}
+        run: pnpm install --frozen-lockfile --ignore-scripts --prefer-offline
 
-      - if: inputs.submodule-cache-key != 'none'
+      - name: Initialize ethereum-tests (from cache)
+        if: inputs.submodule-cache-key != 'none'
         uses: actions/cache/restore@v4
-        name: Initialize ethereum-tests
-        id: submodules-cache
         with:
-          path: ${{github.workspace}}/packages/ethereum-tests
-          key: ${{ inputs.submodule-cache-key}}
+          path: ${{ github.workspace }}/packages/ethereum-tests
+          key: ${{ inputs.submodule-cache-key }}
           fail-on-cache-miss: true
 
-      - run: npm run coverage
-      - uses: codecov/codecov-action@v4
+      - name: Coverage @ethereumjs/block
+        working-directory: ${{ github.workspace }}/packages/block
+        run: pnpm run coverage
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          files: ${{ github.workspace}}/packages/block/coverage/lcov.info
+          files: ${{ github.workspace }}/packages/block/coverage/lcov.info
           flags: block

.github/workflows/blockchain-build.yml

@@ -33,25 +33,30 @@ jobs:
       - if: inputs.submodule-cache-key == 'none'
         uses: actions/checkout@v5
 
-      # We restore the code/deps from cache if triggered from workflow_call (i.e. have valid cache key)  
+      # We restore the code/deps from cache if triggered from workflow_call (i.e. have valid cache key)
       - uses: actions/cache/restore@v4
         id: dep-cache
         with:
           path: ${{github.workspace}}
           key: ${{ inputs.dep-cache-key }}
-  
+
       - name: Use Node.js 20
         uses: actions/setup-node@v5
         with:
           node-version: 20
-          cache: 'npm'
+          cache: 'pnpm'
+
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 10.5.2
+          run_install: false
 
       - name: Install Dependencies (if called from workflow_dispatch)
         if: steps.dep-cache.outputs.cache-hit != 'true'
-        run: npm ci     
+        run: pnpm install --frozen-lockfile
         working-directory: ${{ github.workspace }}
-            
-      - run: npm run coverage
+
+      - run: pnpm run coverage
       - uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/browser.yml

@@ -45,15 +45,19 @@ jobs:
           path: ${{github.workspace}}
           key: ${{ inputs.dep-cache-key }}
 
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 10.5.2
+          run_install: false
+
       - name: Use Node.js 20
         uses: actions/setup-node@v5
         with:
           node-version: 20
-          cache: 'npm'
 
       - name: Install Dependencies (if called from workflow_dispatch)
         if: steps.dep-cache.outputs.cache-hit != 'true'
-        run: npm ci     
+        run: pnpm install --frozen-lockfile
         working-directory: ${{ github.workspace }}
 
       - if: inputs.submodule-cache-key != 'none'
@@ -64,10 +68,8 @@ jobs:
           path: ${{github.workspace}}/packages/ethereum-tests
           key: ${{ inputs.submodule-cache-key }}
 
-      - run: npm run install-browser-deps
+      - run: pnpm run install-browser-deps
       - run: npx playwright install --with-deps
 
-      - run: npm run test:browser --workspaces --if-present
-
-
+      - run: pnpm run test:browser
 

.github/workflows/build.yml

@@ -8,76 +8,113 @@ on:
   workflow_dispatch:
 
 env:
-  cwd: ${{github.workspace}}
+  cwd: ${{ github.workspace }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-build
   cancel-in-progress: true
 
 jobs:
   checkout-submodules:
-    runs-on: ubuntu-latest
-
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v5
         with:
           submodules: recursive
 
       - id: create-cache-key
-        run: echo "submodule-cache-key=$(git submodule | head -n 1)" >> $GITHUB_OUTPUT
         shell: bash
+        run: echo "submodule-cache-key=$(git submodule | head -n 1)" >> "$GITHUB_OUTPUT"
 
       - uses: actions/cache/restore@v4
         id: submodules-cache-restore
         with:
           key: submodule-${{ steps.create-cache-key.outputs.submodule-cache-key }}
-          path: ${{github.workspace}}/packages/ethereum-tests
-
-      - if: steps.submodules-cache-restore.outputs.cache-hit != 'true'
+          path: ${{ github.workspace }}/packages/ethereum-tests
+
+      - name: Check submodule dir exists
+        id: have-et
+        run: |
+          if [ -d "${{ github.workspace }}/packages/ethereum-tests" ]; then
+            echo "exists=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "exists=false" >> "$GITHUB_OUTPUT"
+          fi
+
+      - if: steps.submodules-cache-restore.outputs.cache-hit != 'true' && steps.have-et.outputs.exists == 'true'
         uses: actions/cache/save@v4
-        id: submodule-cache-save
         with:
-          path: ${{github.workspace}}/packages/ethereum-tests
-          key: submodule-${{ steps.create-cache-key.outputs.submodule-cache-key}}
+          path: ${{ github.workspace }}/packages/ethereum-tests
+          key: submodule-${{ steps.create-cache-key.outputs.submodule-cache-key }}
 
     outputs:
-      submodule-cache-key: submodule-${{ steps.create-cache-key.outputs.submodule-cache-key}}
+      submodule-cache-key: submodule-${{ steps.create-cache-key.outputs.submodule-cache-key }}
 
   build:
-    runs-on: ubuntu-latest
+    needs: checkout-submodules
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v5
+        with:
+          submodules: recursive
 
-      - uses: actions/cache/restore@v4
-        id: dep-cache
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
         with:
-          path: ${{github.workspace}}/node_modules
-          key: npm-${{ hashFiles('package-lock.json') }}
+          run_install: false
 
-      - name: Use Node.js 20
+      - name: Setup Node (with pnpm cache here only)
         uses: actions/setup-node@v5
         with:
-          node-version: 20
-          cache: 'npm'
+          node-version: '20'
+          cache: pnpm
+          cache-dependency-path: pnpm-lock.yaml
 
-      - run: npm ci
-        working-directory: ${{github.workspace}}
+      - run: pnpm -v && command -v pnpm
 
-      - name: Cache dependencies
-        uses: actions/cache/save@v4
+      - name: Restore ethereum-tests submodule
+        uses: actions/cache/restore@v4
         with:
-          path: ${{github.workspace}}
-          key: npm-${{ hashFiles('package-lock.json') }}
+          path: ${{ github.workspace }}/packages/ethereum-tests
+          key: ${{ needs.checkout-submodules.outputs.submodule-cache-key }}
+
+      - name: Install deps (workspace root)
+        working-directory: ${{ github.workspace }}
+        run: pnpm install --frozen-lockfile
+
+      - name: Install browser deps
+        run: pnpm run install-browser-deps
 
-      - name: Cache build
+      - name: Build (workspace)
+        run: pnpm build
+
+      - name: Compute dep cache key
+        id: depkey
+        shell: bash
+        run: |
+          set -euo pipefail
+          KEY="deps-${{ runner.os }}-node20-$(sha256sum pnpm-lock.yaml | cut -d' ' -f1)-${GITHUB_RUN_ID}"
+          echo "dep-cache-key=$KEY" >> "$GITHUB_OUTPUT"
+
+      - name: Verify workspace exists
+        id: have-ws
+        run: |
+          if [ -d "${{ github.workspace }}" ]; then
+            echo "exists=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "exists=false" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Save prepared workspace
+        if: steps.have-ws.outputs.exists == 'true'
         uses: actions/cache/save@v4
         with:
-          path: ${{github.workspace}}
-          key: npm-${{ hashFiles('package-lock.json') }}-${{ github.run_id }}
+          path: ${{ github.workspace }}
+          key: ${{ steps.depkey.outputs.dep-cache-key }}
 
     outputs:
-      dep-cache-key: ${{ steps.dep-cache.outputs.cache-primary-key }}-${{ github.run_id }}
+      dep-cache-key: ${{ steps.depkey.outputs.dep-cache-key }}
 
   binarytree:
     needs: [build, checkout-submodules]