Skip to content

Commit 47410f1

Browse files
committed
Merge branch 'master' of github.com:ethereumjs/ethereumjs-monorepo into evmmax-0
2 parents 8bddbb4 + 17d3f69 commit 47410f1

File tree

1,330 files changed

+50898
-41196
lines changed

Some content is hidden

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

1,330 files changed

+50898
-41196
lines changed

.github/workflows/noCompile.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,17 @@ jobs:
2121
# Set default values for cache keys when triggered by push
2222
env:
2323
DEP_CACHE_KEY: ${{ github.event_name == 'push' && 'none' || inputs.dep-cache-key }}
24-
24+
2525
steps:
26+
- uses: actions/checkout@v4
2627
# We restore the code/deps from cache if triggered from workflow_call (i.e. have valid cache key)
27-
- if: env.DEP_CACHE_KEY != 'none'
28+
- if: env.DEP_CACHE_KEY != 'none'
2829
uses: actions/cache/restore@v4
2930
id: dep-cache
3031
with:
3132
path: ${{github.workspace}}
3233
key: ${{ env.DEP_CACHE_KEY }}
33-
34+
3435
- name: Use Node.js 22
3536
uses: actions/setup-node@v4
3637
with:
@@ -39,8 +40,8 @@ jobs:
3940

4041
- name: Install Dependencies (if not restored from cache)
4142
if: steps.dep-cache.outputs.cache-hit != 'true'
42-
run: npm i --ignore-scripts
43+
run: npm i --ignore-scripts
4344
working-directory: ${{ github.workspace }}
44-
45+
4546
- run: node --conditions=typescript --experimental-strip-types scripts/inlineClient.ts
46-
working-directory: ${{ github.workspace }}/packages/client
47+
working-directory: ${{ github.workspace }}/packages/client

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ COPY packages/blockchain/dist packages/blockchain/dist
1313
COPY packages/client/dist packages/client/dist
1414
COPY packages/common/dist packages/common/dist
1515
COPY packages/devp2p/dist packages/devp2p/dist
16-
COPY packages/era/dist packages/era/dist
16+
COPY packages/e2store/dist packages/e2store/dist
1717
COPY packages/ethash/dist packages/ethash/dist
1818
COPY packages/evm/dist packages/evm/dist
1919
COPY packages/genesis/dist packages/genesis/dist
@@ -33,7 +33,7 @@ COPY packages/blockchain/package.json packages/blockchain/package.json
3333
COPY packages/client/package.json packages/client/package.json
3434
COPY packages/common/package.json packages/common/package.json
3535
COPY packages/devp2p/package.json packages/devp2p/package.json
36-
COPY packages/era/package.json packages/era/package.json
36+
COPY packages/e2store/package.json packages/e2store/package.json
3737
COPY packages/ethash/package.json packages/ethash/package.json
3838
COPY packages/evm/package.json packages/evm/package.json
3939
COPY packages/genesis/package.json packages/genesis/package.json

config/cspell-ts.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
}
2525
],
2626
"words": [
27+
"immediates",
2728
"unerasable",
2829
"bytelist",
2930
"bytestring",

config/typedoc.cjs renamed to config/typedoc.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module.exports = {
1+
export default {
22
plugin: 'typedoc-plugin-markdown',
33
readme: 'none',
44
gitRevision: 'master',

0 commit comments

Comments
 (0)