Skip to content

Commit

Permalink
Merge branch 'das' into data-cols-by-root
Browse files Browse the repository at this point in the history
# Conflicts:
#	beacon_node/beacon_chain/src/data_availability_checker.rs
#	beacon_node/beacon_chain/src/data_availability_checker/availability_view.rs
#	consensus/types/src/chain_spec.rs
  • Loading branch information
jimmygchen committed Feb 20, 2024
2 parents 4f3b243 + 28756da commit e707536
Show file tree
Hide file tree
Showing 83 changed files with 3,111 additions and 1,499 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/test-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,9 @@ jobs:
run: |
make
- name: Install lcli
if: env.SELF_HOSTED_RUNNERS == 'false'
# TODO: uncomment after the version of lcli in https://github.com/sigp/lighthouse/pull/5137
# is installed on the runners
# if: env.SELF_HOSTED_RUNNERS == 'false'
run: make install-lcli
- name: Run the doppelganger protection failure test script
run: |
Expand Down
Loading

0 comments on commit e707536

Please sign in to comment.