Merge branch 'master' into evm-error-handling

Author: jochem-brouwer

.githooks/pre-push

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

.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-trie.md

@@ -67,7 +67,8 @@ jobs:
           fail-on-cache-miss: true
 
       - run: npm run coverage
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           files: ${{ github.workspace}}/packages/block/coverage/lcov.info
-          flags: block
+          flags: block

.github/workflows/block-build.yml

@@ -52,7 +52,8 @@ jobs:
         working-directory: ${{ github.workspace }}
 
       - run: npm run coverage
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           files: ${{ env.cwd }}/coverage/lcov.info
           flags: blockchain

.github/workflows/blockchain-build.yml

@@ -2,6 +2,9 @@ name: Build
 on:
   pull_request:
     types: [opened, reopened, synchronize]
+  push:
+    branches: [master]
+    tags: ['*']
   workflow_dispatch:
 
 env:
@@ -36,8 +39,8 @@ jobs:
         with:
           path: ${{github.workspace}}/packages/ethereum-tests
           key: submodule-${{ steps.create-cache-key.outputs.submodule-cache-key}}
-      
-    outputs: 
+
+    outputs:
       submodule-cache-key: submodule-${{ steps.create-cache-key.outputs.submodule-cache-key}}
 
   build:
@@ -51,7 +54,7 @@ jobs:
         with:
           path: ${{github.workspace}}/node_modules
           key: npm-${{ hashFiles('package-lock.json') }}
-          
+
       - name: Use Node.js 20
         uses: actions/setup-node@v4
         with:
@@ -60,7 +63,7 @@ jobs:
 
       - run: npm ci
         working-directory: ${{github.workspace}}
-        
+
       - name: Cache dependencies
         uses: actions/cache/save@v4
         with:
@@ -73,19 +76,21 @@ jobs:
           path: ${{github.workspace}}
           key: npm-${{ hashFiles('package-lock.json') }}-${{ github.run_id }}
 
-    outputs: 
+    outputs:
       dep-cache-key: ${{ steps.dep-cache.outputs.cache-primary-key }}-${{ github.run_id }}
 
   block:
     needs: [build, checkout-submodules]
     uses: ./.github/workflows/block-build.yml
+    secrets: inherit
     with:
       dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
       submodule-cache-key: ${{ needs.checkout-submodules.outputs.submodule-cache-key }}
-  
+
   blockchain:
     needs: build
     uses: ./.github/workflows/blockchain-build.yml
+    secrets: inherit
     with:
       dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
 
@@ -99,30 +104,35 @@ jobs:
   client:
     needs: build
     uses: ./.github/workflows/client-build.yml
+    secrets: inherit
     with:
       dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
 
   common:
     needs: build
     uses: ./.github/workflows/common-build.yml
+    secrets: inherit
     with:
       dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
 
   devp2p:
     needs: build
     uses: ./.github/workflows/devp2p-build.yml
+    secrets: inherit
     with:
       dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
 
   ethash:
     needs: build
     uses: ./.github/workflows/ethash-build.yml
+    secrets: inherit
     with:
       dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
 
   evm:
     needs: [build, checkout-submodules]
     uses: ./.github/workflows/evm-build.yml
+    secrets: inherit
     with:
       dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
       submodule-cache-key: ${{ needs.checkout-submodules.outputs.submodule-cache-key }}
@@ -136,37 +146,43 @@ jobs:
   genesis:
     needs: build
     uses: ./.github/workflows/genesis-build.yml
+    secrets: inherit
+    with:
+      dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
+
+  mpt:
+    needs: build
+    uses: ./.github/workflows/mpt-build.yml
+    secrets: inherit
     with:
       dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
 
   rlp:
     needs: build
     uses: ./.github/workflows/rlp-build.yml
+    secrets: inherit
     with:
       dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
 
   statemanager:
     needs: build
     uses: ./.github/workflows/statemanager-build.yml
+    secrets: inherit
     with:
       dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
 
-  trie:
-    needs: build
-    uses: ./.github/workflows/trie-build.yml
-    with:
-      dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
-  
   tx:
     needs: [build, checkout-submodules]
     uses: ./.github/workflows/tx-build.yml
+    secrets: inherit
     with:
       dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
       submodule-cache-key: ${{ needs.checkout-submodules.outputs.submodule-cache-key }}
 
   util:
     needs: build
     uses: ./.github/workflows/util-build.yml
+    secrets: inherit
     with:
       dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
 
@@ -179,16 +195,18 @@ jobs:
   vm-pr:
     needs: [build, checkout-submodules]
     uses: ./.github/workflows/vm-pr.yml
+    secrets: inherit
     with:
       dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
       submodule-cache-key: ${{ needs.checkout-submodules.outputs.submodule-cache-key }}
 
   wallet:
     needs: build
     uses: ./.github/workflows/wallet-build.yml
+    secrets: inherit
     with:
       dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
-  
+
   lint:
     needs: build
     uses: ./.github/workflows/lint.yml
@@ -201,5 +219,3 @@ jobs:
     with:
       dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
       submodule-cache-key: ${{ needs.checkout-submodules.outputs.submodule-cache-key }}
-
-  

.github/workflows/build.yml

@@ -54,8 +54,9 @@ jobs:
         working-directory: ${{ github.workspace }}
 
       - run: npm run coverage
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           files: ${{ env.cwd }}/coverage/lcov.info
           flags: client
 

.github/workflows/client-build.yml

@@ -54,7 +54,8 @@ jobs:
         working-directory: ${{ github.workspace }}            
 
       - run: npm run coverage
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           files: ${{ env.cwd }}/coverage/lcov.info
           flags: common

.github/workflows/common-build.yml

@@ -14,6 +14,9 @@ on:
         required: false
         default: 'none'
 
+env:
+  cwd: ${{github.workspace}}/packages/devp2p
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-devp2p
   cancel-in-progress: true
@@ -49,9 +52,10 @@ jobs:
 
       - run: npm run coverage
         working-directory: ${{ github.workspace }}/packages/devp2p
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         with:
-          files: ${{ github.workspace }}/packages/devp2p/coverage/lcov.info
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: ${{ env.cwd }}/coverage/lcov.info
           flags: devp2p
 
 

.github/workflows/devp2p-build.yml

@@ -57,7 +57,8 @@ jobs:
 
 
       - run: npm run coverage
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           files: ${{ env.cwd }}/coverage/lcov.info
           flags: ethash