[pull] master from ethereumjs:master

.editorconfig

@@ -0,0 +1,16 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_size = 2
+indent_style = space
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
+indent_size = 2
+indent_style = space

.githooks/pre-commit

@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+
+node ./node_modules/lint-staged/bin/lint-staged.js

.githooks/pre-push

@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+
+npm run lint:diff --workspaces

.github/ISSUE_TEMPLATE/general.md

@@ -4,7 +4,4 @@ about: Open blank issue
 title: ''
 labels: ''
 assignees: ''
-
 ---
-
-

.github/ISSUE_TEMPLATE/package--ethereumjs-block.md

@@ -4,7 +4,4 @@ about: Create issue for @ethereumjs/block
 title: ''
 labels: 'package: block'
 assignees: ''
-
 ---
-
-

.github/ISSUE_TEMPLATE/package--ethereumjs-client.md

@@ -4,7 +4,4 @@ about: Create issue for @ethereumjs/client
 title: ''
 labels: 'package: client'
 assignees: ''
-
 ---
-
-

.github/ISSUE_TEMPLATE/package--ethereumjs-devp2p.md

@@ -4,7 +4,4 @@ about: Create issue for @ethereumjs/devp2p
 title: ''
 labels: 'package: devp2p'
 assignees: ''
-
 ---
-
-

.github/ISSUE_TEMPLATE/package--ethereumjs-ethash.md

@@ -4,7 +4,4 @@ about: Create issue for @ethereumjs/ethash
 title: ''
 labels: 'package: ethash'
 assignees: ''
-
 ---
-
-

.github/ISSUE_TEMPLATE/package--ethereumjs-evm.md

@@ -0,0 +1,7 @@
+---
+name: 'Package: @ethereumjs/evm'
+about: Create issue for @ethereumjs/evm package
+title: ''
+labels: 'package: evm'
+assignees: ''
+---

.github/ISSUE_TEMPLATE/package--ethereumjs-mpt.md

@@ -0,0 +1,7 @@
+---
+name: 'Package: @ethereumjs/mpt'
+about: Create issue for @ethereumjs/mpt package
+title: ''
+labels: 'package: mpt'
+assignees: ''
+---

.github/ISSUE_TEMPLATE/package--ethereumjs-statemanager.md

@@ -0,0 +1,7 @@
+---
+name: 'Package: @ethereumjs/statemanager'
+about: Create issue for @ethereumjs/statemanager
+title: ''
+labels: 'package: statemanager'
+assignees: ''
+---

.github/ISSUE_TEMPLATE/package--ethereumjs-verkle.md

@@ -0,0 +1,7 @@
+---
+name: 'Package: @ethereumjs/verkle'
+about: Create issue for @ethereumjs/verkle package
+title: ''
+labels: 'package: verkle'
+assignees: ''
+---

.github/ISSUE_TEMPLATE/package--monorepo.md

@@ -4,7 +4,4 @@ about: Create a monorepo-wide issue (e.g. on CI or docs)
 title: ''
 labels: 'package: monorepo'
 assignees: ''
-
 ---
-
-

.github/ISSUE_TEMPLATE/package--rlp.md

@@ -0,0 +1,7 @@
+---
+name: 'Package: rlp'
+about: Create issue for rlp package
+title: ''
+labels: 'package: rlp'
+assignees: ''
+---

.github/workflows/block-build.yml

@@ -1,12 +1,21 @@
 name: Block
 on:
-  push:
-    branches:
-      - master
-    tags:
-      - '*'
-  pull_request:
-    types: [opened, reopened, synchronize]
+  workflow_call:
+    inputs:
+      dep-cache-key:
+        required: true
+        type: string
+      submodule-cache-key:
+          required: true
+          type: string
+  workflow_dispatch:
+    inputs:
+      dep-cache-key:
+        required: false
+        default: 'none'
+      submodule-cache-key:
+        required: false
+        default: 'none'
 
 env:
   cwd: ${{github.workspace}}/packages/block
@@ -15,44 +24,51 @@ defaults:
   run:
     working-directory: packages/block
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-block
+  cancel-in-progress: true
+
 jobs:
   test-block:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [12]
-    steps:
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-      - uses: actions/checkout@v2
+    steps:     
+      # We clone the repo and submodules if triggered from work-flow dispatch
+      - if: inputs.submodule-cache-key == 'none'
+        uses: actions/checkout@v4
         with:
           submodules: recursive
-
-      - name: Dependency cache
-        uses: actions/cache@v2
-        id: cache
+
+      # 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
+        with:
+          path: ${{github.workspace}}
+          key: ${{ inputs.dep-cache-key }}
+
+      - name: Use Node.js 20
+        uses: actions/setup-node@v4
         with:
-          key: Block-${{ runner.os }}-${{ matrix.node-version }}-${{ hashFiles('**/package-lock.json') }}
-          path: '**/node_modules'
+          node-version: 20
+          cache: 'npm'
 
-      # Installs root dependencies, ignoring Bootstrap All script.
-      # Bootstraps the current package only
-      - run: npm install --ignore-scripts && npm run bootstrap:block
-        if: steps.cache.outputs.cache-hit != 'true'
-        working-directory: ${{github.workspace}}
+      - name: Install Dependencies (if called from workflow_dispatch)
+        if: steps.dep-cache.outputs.cache-hit != 'true'
+        run: npm ci     
+        working-directory: ${{ github.workspace }}
 
-      # Builds current package and the ones it depends from.
-      - run: npm run build:block
-        working-directory: ${{github.workspace}}
+      - 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}}
+          fail-on-cache-miss: true
 
       - run: npm run coverage
-
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v4
         with:
-          file: ${{ env.cwd }}/coverage/lcov.info
-          flags: block
-        if: ${{ matrix.node-version == 12 }}
-
-      - run: npm run lint
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: ${{ github.workspace}}/packages/block/coverage/lcov.info
+          flags: block

.github/workflows/blockchain-build.yml

@@ -1,12 +1,18 @@
 name: Blockchain
 on:
-  push:
-    branches:
-      - master
-    tags:
-      - '*'
-  pull_request:
-    types: [opened, reopened, synchronize]
+  workflow_call:
+    inputs:
+      dep-cache-key:
+        required: true
+        type: string
+  workflow_dispatch:
+    inputs:
+      dep-cache-key:
+        required: false
+        default: 'none'
+      submodule-cache-key:
+        required: false
+        default: 'none'
 
 env:
   cwd: ${{github.workspace}}/packages/blockchain
@@ -15,44 +21,39 @@ defaults:
   run:
     working-directory: packages/blockchain
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-blockchain
+  cancel-in-progress: true
+
 jobs:
   test-blockchain:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [12]
     steps:
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
+      # We clone the repo and submodules if triggered from work-flow dispatch
+      - if: inputs.submodule-cache-key == 'none'
+        uses: actions/checkout@v4
 
-      - name: Dependency cache
-        uses: actions/cache@v2
-        id: cache
+      # 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:
-          key: Blockchain-${{ runner.os }}-${{ matrix.node-version }}-${{ hashFiles('**/package-lock.json') }}
-          path: '**/node_modules'
-
-      # Installs root dependencies, ignoring Bootstrap All script.
-      # Bootstraps the current package only
-      - run: npm install --ignore-scripts && npm run bootstrap:blockchain
-        if: steps.cache.outputs.cache-hit != 'true'
-        working-directory: ${{github.workspace}}
-
-      # Builds current package and the ones it depends from.
-      - run: npm run build:blockchain
-        working-directory: ${{github.workspace}}
-
+          path: ${{github.workspace}}
+          key: ${{ inputs.dep-cache-key }}
+
+      - name: Use Node.js 20
+        uses: actions/setup-node@v4
+        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     
+        working-directory: ${{ github.workspace }}
+
       - run: npm run coverage
-
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v4
         with:
-          file: ${{ env.cwd }}/coverage/lcov.info
-          flags: blockchain
-        if: ${{ matrix.node-version == 12 }}
-
-      - run: npm run lint
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: ${{ env.cwd }}/coverage/lcov.info
+          flags: blockchain