Skip to content

Commit 5e47e75

Browse files
authored
Merge branch 'master' into client-rpc-payload-limit
2 parents dd46b41 + 20cae2b commit 5e47e75

File tree

166 files changed

+1619
-2497
lines changed

Some content is hidden

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

166 files changed

+1619
-2497
lines changed

.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/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/ethash-build.yml

Lines changed: 0 additions & 64 deletions
This file was deleted.

.github/workflows/genesis-build.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.

.github/workflows/noCompile.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ on:
1010
dep-cache-key:
1111
required: false
1212
default: 'none'
13-
push:
14-
branches:
15-
- master
1613

1714
concurrency:
1815
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-noCompile
@@ -34,16 +31,16 @@ jobs:
3431
path: ${{github.workspace}}
3532
key: ${{ env.DEP_CACHE_KEY }}
3633

37-
- name: Use Node.js 23
34+
- name: Use Node.js 22
3835
uses: actions/setup-node@v4
3936
with:
40-
node-version: 23
37+
node-version: 22
4138
cache: 'npm'
4239

4340
- name: Install Dependencies (if not restored from cache)
4441
if: steps.dep-cache.outputs.cache-hit != 'true'
45-
run: npm ci --ignore-scripts
42+
run: npm i --ignore-scripts
4643
working-directory: ${{ github.workspace }}
4744

48-
- run: node --conditions=typescript --experimental-strip-types examples/inlineClient.ts
45+
- run: node --conditions=typescript --experimental-strip-types scripts/inlineClient.ts
4946
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 }}

.github/workflows/wallet-build.yml

Lines changed: 0 additions & 58 deletions
This file was deleted.

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM node:22-alpine
22
RUN apk update && apk add --no-cache bash git g++ make python3 && rm -rf /var/cache/apk/*
33

4-
WORKDIR /usr/app
4+
WORKDIR /ethereumjs-monorepo
55

66
COPY .git .git
77
COPY node_modules node_modules
@@ -48,11 +48,11 @@ COPY packages/wallet/package.json packages/wallet/package.json
4848

4949

5050
# Sanity check
51-
RUN node /usr/app/packages/client/dist/esm/bin/cli.js --help
51+
RUN node /ethereumjs-monorepo/packages/client/dist/esm/bin/cli.js --help
5252

5353
# NodeJS applications have a default memory limit of 2.5GB.
5454
# This limit is bit tight, it is recommended to raise the limit
5555
# since memory may spike during certain network conditions.
5656
ENV NODE_OPTIONS=--max_old_space_size=6144
5757

58-
ENTRYPOINT ["node", "/usr/app/packages/client/dist/esm/bin/cli.js"]
58+
ENTRYPOINT ["node", "/ethereumjs-monorepo/packages/client/dist/esm/bin/cli.js"]

config/cspell-ts.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
}
2525
],
2626
"words": [
27+
"unerasable",
2728
"bytelist",
2829
"bytestring",
2930
"binarytree",
@@ -305,6 +306,7 @@
305306
"MCOPY",
306307
"JUMPF",
307308
"SELFDESTRUCT",
309+
"AUTHCALL",
308310
"triggerable",
309311
"RETURNDATASIZE",
310312
"RETURNDATACOPY",

0 commit comments

Comments
 (0)