Skip to content

Commit

Permalink
Merge branch 'unstable' into dapplion/yamux
Browse files Browse the repository at this point in the history
  • Loading branch information
wemeetagain committed Feb 10, 2023
2 parents 8f8555f + 992c54f commit d5327c1
Show file tree
Hide file tree
Showing 453 changed files with 9,880 additions and 3,648 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:

jobs:
run:
runs-on: ubuntu-latest
runs-on: buildjet-4vcpu-ubuntu-2204
# Skip for dependabot PRs, secrets are not made available and will fail
# Don't run on forks. Forks don't have access to the S3 credentials and the workflow will fail
if: |
Expand All @@ -26,8 +26,8 @@ jobs:
steps:
# <common-build> - Uses YAML anchors in the future
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
- name: Node.js version
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ on:
jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
runs-on: buildjet-4vcpu-ubuntu-2204
permissions:
actions: read
contents: read
Expand All @@ -52,11 +52,11 @@ jobs:
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality


# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
Expand All @@ -65,7 +65,7 @@ jobs:
# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# If the Autobuild fails above, remove it and uncomment the following three lines.
# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# - run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ on:

jobs:
docs:
runs-on: ubuntu-latest
runs-on: buildjet-4vcpu-ubuntu-2204
steps:
# <common-build> - Uses YAML anchors in the future
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
- name: Node.js version
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/publish-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ on:
jobs:
npm:
name: Publish to NPM Registry
runs-on: ubuntu-latest
runs-on: buildjet-4vcpu-ubuntu-2204
steps:
# <common-build> - Uses YAML anchors in the future
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: actions/setup-node@v2
- uses: actions/setup-node@v3
with:
node-version: 18
registry-url: "https://registry.npmjs.org"
Expand Down Expand Up @@ -104,10 +104,10 @@ jobs:

docker:
name: Publish to Docker Hub
runs-on: ubuntu-latest
runs-on: buildjet-4vcpu-ubuntu-2204
needs: npm
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
# https://github.com/docker/setup-qemu-action
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/publish-rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ on:
jobs:
tag:
name: Check tag
runs-on: ubuntu-latest
runs-on: buildjet-4vcpu-ubuntu-2204
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0

Expand Down Expand Up @@ -44,12 +44,12 @@ jobs:

npm:
name: Publish to NPM & Github
runs-on: ubuntu-latest
runs-on: buildjet-4vcpu-ubuntu-2204
needs: tag
if: needs.tag.outputs.is_rc == 'true'
steps:
# <common-build> - Uses YAML anchors in the future
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Needs full depth for changelog generation
- uses: actions/setup-node@v2
Expand Down Expand Up @@ -126,11 +126,11 @@ jobs:

docker:
name: Publish to Docker Hub
runs-on: ubuntu-latest
runs-on: buildjet-4vcpu-ubuntu-2204
needs: [tag, npm]
if: needs.tag.outputs.is_rc == 'true'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: scripts/await-release.sh ${{ needs.tag.outputs.tag }} rc 900
# https://github.com/docker/setup-qemu-action
- name: Set up QEMU
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/publish-stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ on:
jobs:
tag:
name: Check tag
runs-on: ubuntu-latest
runs-on: buildjet-4vcpu-ubuntu-2204
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0

Expand Down Expand Up @@ -50,15 +50,15 @@ jobs:

npm:
name: Publish to NPM & Github
runs-on: ubuntu-latest
runs-on: buildjet-4vcpu-ubuntu-2204
needs: tag
if: needs.tag.outputs.is_stable == 'true'
steps:
# <common-build> - Uses YAML anchors in the future
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Needs full depth for changelog generation
- uses: actions/setup-node@v2
- uses: actions/setup-node@v3
with:
node-version: 18
- name: Node.js version
Expand Down Expand Up @@ -116,11 +116,11 @@ jobs:

docker:
name: Publish to Docker Hub
runs-on: ubuntu-latest
runs-on: buildjet-4vcpu-ubuntu-2204
needs: [tag, npm]
if: needs.tag.outputs.is_stable == 'true'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: scripts/await-release.sh ${{ needs.tag.outputs.tag }} latest 900
# https://github.com/docker/setup-qemu-action
- name: Set up QEMU
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-browser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ on:
jobs:
tests-main:
name: Tests
runs-on: ubuntu-latest
runs-on: buildjet-4vcpu-ubuntu-2204
strategy:
fail-fast: false
matrix:
node: [18]
steps:
# <common-build> - Uses YAML anchors in the future
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: browser-actions/setup-firefox@latest
with:
firefox-version: "latest"
- uses: actions/setup-node@v2
- uses: actions/setup-node@v3
with:
node-version: ${{matrix.node}}
- name: Node.js version
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ env:
jobs:
tests-main:
name: Tests
runs-on: ubuntu-latest
runs-on: buildjet-4vcpu-ubuntu-2204
strategy:
fail-fast: false
matrix:
node: [18]
steps:
# <common-build> - Uses YAML anchors in the future
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: ${{matrix.node}}
- name: Node.js version
Expand Down
43 changes: 21 additions & 22 deletions .github/workflows/test-sim-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ env:
GETH_IMAGE: ethereum/client-go:v1.10.25
NETHERMIND_IMAGE: nethermind/nethermind:1.14.3
MERGEMOCK_IMAGE: g11tech/mergemock:latest
GETH_WITHDRAWALS_IMAGE: ethpandaops/geth:withdrawals-timestamp-e92fb91
ETHEREUMJS_WITHDRAWALS_IMAGE: g11tech/ethereumjs:withdrawals-07b106
GETH_WITHDRAWALS_IMAGE: g11tech/geth:withdrawalsfeb8
ETHEREUMJS_WITHDRAWALS_IMAGE: g11tech/ethereumjs:feb8
NETHERMIND_WITHDRAWALS_IMAGE: nethermindeth/nethermind:withdrawals_yolo

jobs:
sim-merge-tests:
name: Sim merge tests
runs-on: ubuntu-latest
runs-on: buildjet-4vcpu-ubuntu-2204
steps:
# <common-build> - Uses YAML anchors in the future
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
- name: Node.js version
Expand Down Expand Up @@ -89,25 +89,25 @@ jobs:
name: debug-test-logs
path: packages/beacon-node/test-logs

# - name: Pull geth withdrawals
# run: docker pull $GETH_WITHDRAWALS_IMAGE
- name: Pull geth withdrawals
run: docker pull $GETH_WITHDRAWALS_IMAGE

# - name: Test Lodestar <> geth withdrawals
# run: yarn test:sim:withdrawals
# working-directory: packages/beacon-node
# env:
# EL_BINARY_DIR: ${{ env.GETH_WITHDRAWALS_IMAGE }}
# EL_SCRIPT_DIR: gethdocker
- name: Test Lodestar <> geth withdrawals
run: yarn test:sim:withdrawals
working-directory: packages/beacon-node
env:
EL_BINARY_DIR: ${{ env.GETH_WITHDRAWALS_IMAGE }}
EL_SCRIPT_DIR: gethdocker

# - name: Pull ethereumjs withdrawals
# run: docker pull $ETHEREUMJS_WITHDRAWALS_IMAGE
- name: Pull ethereumjs withdrawals
run: docker pull $ETHEREUMJS_WITHDRAWALS_IMAGE

# - name: Test Lodestar <> ethereumjs withdrawals
# run: yarn test:sim:withdrawals
# working-directory: packages/beacon-node
# env:
# EL_BINARY_DIR: ${{ env.ETHEREUMJS_WITHDRAWALS_IMAGE }}
# EL_SCRIPT_DIR: ethereumjsdocker
- name: Test Lodestar <> ethereumjs withdrawals
run: yarn test:sim:withdrawals
working-directory: packages/beacon-node
env:
EL_BINARY_DIR: ${{ env.ETHEREUMJS_WITHDRAWALS_IMAGE }}
EL_SCRIPT_DIR: ethereumjsdocker

# Disable nethermind build as the withdrawal test config seems to be no
# longer available, enable after grabbing a build which has one
Expand All @@ -128,4 +128,3 @@ jobs:
with:
name: debug-test-logs
path: packages/beacon-node/test-logs

10 changes: 5 additions & 5 deletions .github/workflows/test-sim.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ env:
jobs:
tests-sim:
name: Sim tests
runs-on: ubuntu-latest
runs-on: buildjet-4vcpu-ubuntu-2204
steps:
# <common-build> - Uses YAML anchors in the future
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
- name: Node.js version
Expand Down Expand Up @@ -48,8 +48,8 @@ jobs:
run: yarn test:sim:endpoints
working-directory: packages/cli

- name: Sim tests eip4844
run: yarn test:sim:eip4844
- name: Sim tests deneb
run: yarn test:sim:deneb
working-directory: packages/cli

- name: Sim tests backup eth provider
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-spec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ on:
jobs:
tests-spec:
name: Spec tests
runs-on: ubuntu-latest
runs-on: buildjet-4vcpu-ubuntu-2204
steps:
# As of October 2020, runner has +8GB of free space w/out this script (takes 1m30s to run)
# - run: ./scripts/free-disk-space.sh

# <common-build> - Uses YAML anchors in the future
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
- name: Node.js version
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ on:
jobs:
tests-main:
name: Tests
runs-on: ubuntu-latest
runs-on: buildjet-4vcpu-ubuntu-2204
strategy:
fail-fast: false
matrix:
node: [18]
steps:
# <common-build> - Uses YAML anchors in the future
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: ${{matrix.node}}
- name: Node.js version
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:

# Misc sanity checks
- name: Lint Grafana dashboards
run: node scripts/validate-grafana-dashboard.mjs ./dashboards
run: scripts/validate-grafana-dashboards.sh
- name: Test root binary exists
run: ./lodestar --version
- name: Reject yarn.lock changes
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contribution Guidelines

Thanks for your contribution to Lodestar. It's people like you that push the Ethereum ecosystem forward.
Thanks for your interest in contributing to Lodestar. It's people like you that push the Ethereum ecosystem forward.

## Prerequisites

Expand Down Expand Up @@ -96,7 +96,7 @@ Pull request titles must be:

- Short and descriptive summary
- Should be capitalized and written in imperative present tense
- Not end with period
- Not end with a period

For example:

Expand Down
Loading

0 comments on commit d5327c1

Please sign in to comment.