Skip to content

Commit e92a597

Browse files
committed
Merge branch 'master' of github.com:ethereumjs/ethereumjs-monorepo into evmmax-0
2 parents cd88d03 + 77bf2e9 commit e92a597

File tree

378 files changed

+3885
-16286
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

378 files changed

+3885
-16286
lines changed

.github/workflows/browser.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ jobs:
6464
key: ${{ inputs.submodule-cache-key }}
6565

6666
- run: npm run install-browser-deps
67+
- run: npx playwright install --with-deps
6768

6869
- run: npm run test:browser --workspaces --if-present
6970

.github/workflows/build.yml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -143,23 +143,16 @@ jobs:
143143
with:
144144
dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
145145

146-
genesis:
147-
needs: build
148-
uses: ./.github/workflows/genesis-build.yml
149-
secrets: inherit
150-
with:
151-
dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
152-
153146
mpt:
154147
needs: build
155148
uses: ./.github/workflows/mpt-build.yml
156149
secrets: inherit
157150
with:
158151
dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
159152

160-
rlp:
153+
static:
161154
needs: build
162-
uses: ./.github/workflows/rlp-build.yml
155+
uses: ./.github/workflows/static-build.yml
163156
secrets: inherit
164157
with:
165158
dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
@@ -200,16 +193,15 @@ jobs:
200193
dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
201194
submodule-cache-key: ${{ needs.checkout-submodules.outputs.submodule-cache-key }}
202195

203-
wallet:
196+
lint:
204197
needs: build
205-
uses: ./.github/workflows/wallet-build.yml
206-
secrets: inherit
198+
uses: ./.github/workflows/lint.yml
207199
with:
208200
dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
209201

210-
lint:
202+
noCompile:
211203
needs: build
212-
uses: ./.github/workflows/lint.yml
204+
uses: ./.github/workflows/noCompile.yml
213205
with:
214206
dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
215207

.github/workflows/client-build.yml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -66,25 +66,6 @@ jobs:
6666
max_attempts: 3
6767
command: cd ${{github.workspace}}/packages/client && npm run test:integration
6868

69-
test-client-dockerfile:
70-
name: test client docker file
71-
runs-on: ubuntu-latest
72-
steps:
73-
- uses: actions/checkout@v4
74-
# https://github.com/docker/setup-qemu-action
75-
- name: Set up QEMU
76-
uses: docker/setup-qemu-action@v1
77-
# https://github.com/docker/setup-buildx-action
78-
- name: Set up Docker Buildx
79-
uses: docker/setup-buildx-action@v2
80-
- name: Build from source
81-
run: >
82-
docker buildx build .
83-
--tag ethereumjs:local
84-
--platform linux/amd64
85-
--build-arg COMMIT=$(git rev-parse HEAD)
86-
working-directory: ${{github.workspace}}
87-
8869
test-client-cli:
8970
runs-on: ubuntu-latest
9071
strategy:

.github/workflows/common-build.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,20 @@ jobs:
5353
run: npm ci
5454
working-directory: ${{ github.workspace }}
5555

56+
# Run coverage for common
5657
- run: npm run coverage
5758
- uses: codecov/codecov-action@v4
5859
with:
5960
token: ${{ secrets.CODECOV_TOKEN }}
6061
files: ${{ env.cwd }}/coverage/lcov.info
6162
flags: common
63+
64+
# Run coverage for util
65+
- run: npm run coverage
66+
working-directory: ${{ github.workspace }}/packages/util
67+
68+
- uses: codecov/codecov-action@v4
69+
with:
70+
token: ${{ secrets.CODECOV_TOKEN }}
71+
files: ${{ env.cwd }}/coverage/lcov.info
72+
flags: util

.github/workflows/docker-image.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Docker Build Job
2+
3+
on:
4+
pull_request:
5+
types: [opened, reopened, synchronize]
6+
workflow_dispatch:
7+
push:
8+
branches:
9+
- 'master'
10+
11+
jobs:
12+
docker:
13+
runs-on: ubuntu-latest
14+
strategy:
15+
matrix:
16+
node-version: [20]
17+
steps:
18+
-
19+
name: Set up QEMU
20+
uses: docker/setup-qemu-action@v3
21+
-
22+
name: Set up Docker Buildx
23+
uses: docker/setup-buildx-action@v3
24+
-
25+
name: Login to GitHub Container Registry
26+
uses: docker/login-action@v3
27+
with:
28+
registry: ghcr.io
29+
username: ${{ github.repository_owner }}
30+
password: ${{ secrets.GITHUB_TOKEN }}
31+
- uses: actions/checkout@v3
32+
33+
- name: Use Node.js ${{ matrix.node-version }}
34+
uses: actions/setup-node@v3
35+
with:
36+
node-version: ${{ matrix.node-version }}
37+
cache: 'npm'
38+
39+
- run: npm i
40+
working-directory: ${{ github.workspace }}
41+
42+
-
43+
name: Build & Push
44+
uses: docker/build-push-action@v5
45+
with:
46+
context: .
47+
push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
48+
tags: ghcr.io/${{ github.repository_owner }}/ethereumjs-monorepo:latest
49+
provenance: false

.github/workflows/genesis-build.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.
Lines changed: 17 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,46 @@
1-
name: Ethash
1+
name: NoCompile
22
on:
33
workflow_call:
44
inputs:
55
dep-cache-key:
6-
required: false
6+
required: true
77
type: string
88
workflow_dispatch:
99
inputs:
1010
dep-cache-key:
1111
required: false
1212
default: 'none'
13-
submodule-cache-key:
14-
required: false
15-
default: 'none'
16-
17-
18-
env:
19-
cwd: ${{github.workspace}}/packages/ethash
20-
21-
defaults:
22-
run:
23-
working-directory: packages/ethash
2413

2514
concurrency:
26-
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-ethash
15+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-noCompile
2716
cancel-in-progress: true
2817

2918
jobs:
30-
test-ethash:
19+
test-nocompile:
3120
runs-on: ubuntu-latest
32-
21+
# Set default values for cache keys when triggered by push
22+
env:
23+
DEP_CACHE_KEY: ${{ github.event_name == 'push' && 'none' || inputs.dep-cache-key }}
24+
3325
steps:
34-
# We clone the repo and submodules if triggered from work-flow dispatch
35-
- if: inputs.submodule-cache-key == 'none'
36-
uses: actions/checkout@v4
37-
3826
# We restore the code/deps from cache if triggered from workflow_call (i.e. have valid cache key)
39-
- if: inputs.dep-cache-key != 'none'
27+
- if: env.DEP_CACHE_KEY != 'none'
4028
uses: actions/cache/restore@v4
4129
id: dep-cache
4230
with:
4331
path: ${{github.workspace}}
44-
key: ${{ inputs.dep-cache-key }}
45-
46-
- name: Use Node.js 20
32+
key: ${{ env.DEP_CACHE_KEY }}
33+
34+
- name: Use Node.js 22
4735
uses: actions/setup-node@v4
4836
with:
49-
node-version: 20
37+
node-version: 22
5038
cache: 'npm'
5139

5240
- name: Install Dependencies (if not restored from cache)
5341
if: steps.dep-cache.outputs.cache-hit != 'true'
54-
run: npm ci
42+
run: npm i --ignore-scripts
5543
working-directory: ${{ github.workspace }}
56-
57-
58-
59-
- run: npm run coverage
60-
- uses: codecov/codecov-action@v4
61-
with:
62-
token: ${{ secrets.CODECOV_TOKEN }}
63-
files: ${{ env.cwd }}/coverage/lcov.info
64-
flags: ethash
44+
45+
- run: node --conditions=typescript --experimental-strip-types scripts/inlineClient.ts
46+
working-directory: ${{ github.workspace }}/packages/client

.github/workflows/rlp-build.yml renamed to .github/workflows/static-build.yml

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: RLP
1+
name: Static Packages Build
22
on:
33
workflow_call:
44
inputs:
@@ -14,18 +14,14 @@ on:
1414
required: false
1515

1616
env:
17-
cwd: ${{github.workspace}}/packages/rlp
18-
19-
defaults:
20-
run:
21-
working-directory: packages/rlp
17+
cwd: ${{github.workspace}}/packages/rlp # This doesn't appear to matter since code coverage finds all of the reports
2218

2319
concurrency:
24-
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-rlp
20+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-static
2521
cancel-in-progress: true
2622

2723
jobs:
28-
test-rlp:
24+
test-static:
2925
runs-on: ubuntu-latest
3026

3127
steps:
@@ -52,9 +48,25 @@ jobs:
5248
run: npm ci
5349
working-directory: ${{ github.workspace }}
5450

51+
# Run coverage for rlp
52+
- run: npm run coverage
53+
working-directory: ${{ github.workspace }}/packages/rlp
54+
55+
# Run coverage for genesis
56+
- run: npm run coverage
57+
working-directory: ${{ github.workspace }}/packages/genesis
58+
59+
# Run coverage for ethash
60+
- run: npm run coverage
61+
working-directory: ${{ github.workspace }}/packages/ethash
62+
63+
# Run coverage for wallet
5564
- run: npm run coverage
65+
working-directory: ${{ github.workspace }}/packages/wallet
66+
# Upload code coverage for all jobs
5667
- uses: codecov/codecov-action@v4
5768
with:
5869
token: ${{ secrets.CODECOV_TOKEN }}
5970
files: ${{ env.cwd }}/coverage/lcov.info
60-
flags: rlp
71+
flags: static
72+

.github/workflows/typecheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ jobs:
5959

6060

6161
- run: npm run tsc --workspaces
62-
working-directory: ${{ github.workspace }}
62+
working-directory: ${{ github.workspace }}

0 commit comments

Comments
 (0)