Skip to content

Commit

Permalink
Merge branch 'master' into eip4788-beaconroot
Browse files Browse the repository at this point in the history
  • Loading branch information
jochem-brouwer committed Jul 10, 2023
2 parents de8ffd5 + 364e804 commit 1e72bde
Show file tree
Hide file tree
Showing 454 changed files with 27,169 additions and 8,804 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/block-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16]
node-version: [18]
steps:
- uses: actions/checkout@v3
with:
Expand All @@ -40,9 +40,3 @@ jobs:

- run: npm run lint
- run: npm run coverage

- uses: codecov/codecov-action@v3
with:
files: ${{ env.cwd }}/coverage/lcov.info
flags: block
if: ${{ matrix.node-version == 16 }}
8 changes: 1 addition & 7 deletions .github/workflows/blockchain-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16]
node-version: [18]
steps:
- uses: actions/checkout@v3

Expand All @@ -38,9 +38,3 @@ jobs:

- run: npm run lint
- run: npm run coverage

- uses: codecov/codecov-action@v3
with:
files: ${{ env.cwd }}/coverage/lcov.info
flags: blockchain
if: ${{ matrix.node-version == 16 }}
12 changes: 5 additions & 7 deletions .github/workflows/browser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16]
node-version: [18]
fail-fast: false
steps:
- uses: actions/checkout@v3
Expand All @@ -31,7 +31,7 @@ jobs:

- run: npm ci

# Install playwright dependencies
# Install playwright dependencies
- run: npx playwright install-deps

- run: npm run test:browser -w=@ethereumjs/rlp
Expand All @@ -40,14 +40,12 @@ jobs:
- run: npm run test:browser -w=@ethereumjs/trie
- run: npm run test:browser -w=@ethereumjs/tx
- run: npm run test:browser -w=@ethereumjs/block
# No browser tests for devp2p
# No browser tests for devp2p
- run: npm run test:browser -w=@ethereumjs/blockchain
# No browser tests for ethash
# No browser tests for ethash
- run: npm run test:browser -w=@ethereumjs/wallet
- run: cd ../statemanager && npm run test:browser
# EVM: several tests not passing yet
# - run: cd ../evm && npm run test:browser

- run: cd ../evm && npm run test:browser
# VM: several tests not passing yet
# - run: npm run test:browser -w=@ethereumjs/vm

10 changes: 2 additions & 8 deletions .github/workflows/client-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16]
node-version: [18]
steps:
- uses: actions/checkout@v3

Expand All @@ -38,12 +38,6 @@ jobs:

- run: npm run coverage

- uses: codecov/codecov-action@v3
with:
files: ${{ env.cwd }}/coverage/lcov.info
flags: client
if: ${{ matrix.node-version == 16 }}

- uses: nick-fields/retry@v2
with:
timeout_minutes: 10
Expand Down Expand Up @@ -98,4 +92,4 @@ jobs:
with:
timeout_minutes: 10
max_attempts: 3
command: cd ${{github.workspace}}/packages/client && npm run tape -- 'test/sim/mainnet.spec.ts'
command: cd ${{github.workspace}}/packages/client && npm run tape -- 'test/integration/cli.spec.ts'
8 changes: 1 addition & 7 deletions .github/workflows/common-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16]
node-version: [18]
steps:
- uses: actions/checkout@v3

Expand All @@ -38,9 +38,3 @@ jobs:

- run: npm run lint
- run: npm run coverage

- uses: codecov/codecov-action@v3
with:
files: ${{ env.cwd }}/coverage/lcov.info
flags: common
if: ${{ matrix.node-version == 16 }}
8 changes: 1 addition & 7 deletions .github/workflows/devp2p-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16]
node-version: [18]
steps:
- uses: actions/checkout@v3

Expand All @@ -42,10 +42,4 @@ jobs:
max_attempts: 3
command: cd ${{github.workspace}}/packages/devp2p && npm run coverage

- uses: codecov/codecov-action@v3
with:
files: ${{ env.cwd }}/coverage/lcov.info
flags: devp2p
if: ${{ matrix.node-version == 16 }}

- run: npm run lint
2 changes: 1 addition & 1 deletion .github/workflows/e2e-hardhat.yml.old
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16]
node-version: [18]
steps:
- uses: actions/checkout@v3

Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/ethash-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16]
node-version: [18]
steps:
- uses: actions/checkout@v3

Expand All @@ -38,9 +38,3 @@ jobs:

- run: npm run lint
- run: npm run coverage

- uses: codecov/codecov-action@v3
with:
files: ${{ env.cwd }}/coverage/lcov.info
flags: ethash
if: ${{ matrix.node-version == 16 }}
8 changes: 1 addition & 7 deletions .github/workflows/evm-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16]
node-version: [18]
steps:
- uses: actions/checkout@v3
with:
Expand All @@ -40,9 +40,3 @@ jobs:

- run: npm run lint
- run: npm run coverage

- uses: codecov/codecov-action@v3
with:
files: ${{ env.cwd }}/coverage/lcov.info
flags: evm
if: ${{ matrix.node-version == 16 }}
2 changes: 1 addition & 1 deletion .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- uses: actions/setup-node@v2
with:
node-version: 16
node-version: 18
cache: 'npm'

- run: npm ci
Expand Down
26 changes: 15 additions & 11 deletions .github/workflows/node-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16,18,20]
node-version: [18, 20]
fail-fast: false
steps:
- uses: actions/checkout@v3
Expand All @@ -25,54 +25,58 @@ jobs:
- run: npm ci

- name: Test Block
run: npm run test
run: npm run test:node
working-directory: packages/block

- name: Test Blockchain
run: npm run test
run: npm run test:node
working-directory: packages/blockchain

# Switch client to unit tests only due to `async_hooks` dependency build error in browser tests: 2022-06-15
- name: Test Client
run: npm run test:unit
run: npm run test
working-directory: packages/client

- name: Test Devp2p
run: npm run test
working-directory: packages/devp2p

- name: Test Common
run: npm run test
run: npm run test:node
working-directory: packages/common

- name: Test Ethash
run: npm run test
working-directory: packages/ethash

- name: Test EVM
run: npm run test
run: npm run test:node
working-directory: packages/evm

- name: Test Trie
run: npm run test
run: npm run test:node
working-directory: packages/trie

- name: Test Tx
run: npm run test
run: npm run test:node
working-directory: packages/tx

- name: Test Util
run: npm run test
run: npm run test:node
working-directory: packages/util

- name: Test StateManager
run: npm run test
run: npm run test:node
working-directory: packages/statemanager

- name: Test VM
run: npm run test:API
working-directory: packages/vm

- name: Test RLP
run: npm run test
run: npm run test:node
working-directory: packages/rlp

- name: Test Wallet
run: npm run test:node
working-directory: packages/wallet
8 changes: 1 addition & 7 deletions .github/workflows/rlp-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16]
node-version: [18]
steps:
- uses: actions/checkout@v3

Expand All @@ -38,9 +38,3 @@ jobs:

- run: npm run lint
- run: npm run coverage

- uses: codecov/codecov-action@v3
with:
files: ${{ env.cwd }}/coverage/lcov.info
flags: rlp
if: ${{ matrix.node-version == 16 }}
8 changes: 1 addition & 7 deletions .github/workflows/statemanager-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16]
node-version: [18]
steps:
- uses: actions/checkout@v3

Expand All @@ -38,9 +38,3 @@ jobs:

- run: npm run lint
- run: npm run coverage

- uses: codecov/codecov-action@v3
with:
files: ${{ env.cwd }}/coverage/lcov.info
flags: statemanager
if: ${{ matrix.node-version == 16 }}
10 changes: 2 additions & 8 deletions .github/workflows/trie-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16]
node-version: [18]
steps:
- uses: actions/checkout@v3

Expand All @@ -39,20 +39,14 @@ jobs:
- run: npm run lint
- run: npm run coverage

- uses: codecov/codecov-action@v3
with:
files: ${{ env.cwd }}/coverage/lcov.info
flags: trie
if: ${{ matrix.node-version == 16 }}

# trie-benchmarks:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v3

# - uses: actions/setup-node@v2
# with:
# node-version: 16
# node-version: 18
# cache: 'npm'

# - run: npm ci
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/tx-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16]
node-version: [18]
steps:
- uses: actions/checkout@v3
with:
Expand All @@ -40,9 +40,3 @@ jobs:

- run: npm run lint
- run: npm run coverage

- uses: codecov/codecov-action@v3
with:
files: ${{ env.cwd }}/coverage/lcov.info
flags: tx
if: ${{ matrix.node-version == 16 }}
8 changes: 1 addition & 7 deletions .github/workflows/util-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16]
node-version: [18]
steps:
- uses: actions/checkout@v3

Expand All @@ -38,10 +38,4 @@ jobs:

- run: npm run coverage

- uses: codecov/codecov-action@v3
with:
files: ${{ env.cwd }}/coverage/lcov.info
flags: util
if: ${{ matrix.node-version == 16 }}

- run: npm run lint
Loading

0 comments on commit 1e72bde

Please sign in to comment.