Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Deneb #3783

Closed
wants to merge 446 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
446 commits
Select commit Hold shift + click to select a range
f7f64eb
fix/consolidate some error handling
realbigsean Jan 18, 2023
e1ce4e5
make explicity BlobsUnavailable error and handle it directly
realbigsean Jan 18, 2023
c647944
don't send errors when we *correctly* don't have blobs
realbigsean Jan 18, 2023
8e57eef
return a `BlobsUnavailable` error when the block root is a pre-4844 b…
realbigsean Jan 18, 2023
f7eb89d
Improve error handling
emhane Jan 20, 2023
eb9feed
add new traits
realbigsean Jan 20, 2023
cbd09dc
finish refactor
realbigsean Jan 21, 2023
a83fd1a
remove unused imports
realbigsean Jan 21, 2023
5fc6482
fixup! Improve error handling
emhane Jan 21, 2023
f32f08e
Fix typo
emhane Jan 21, 2023
81a7545
fixup! Improve error handling
emhane Jan 21, 2023
75320ff
cleanup
realbigsean Jan 22, 2023
4a51f65
move available block comment
realbigsean Jan 23, 2023
e145504
Fix mismatched response bug
emhane Jan 23, 2023
b658cc7
simplify checking attester cache for block and blobs. use ResourceUna…
realbigsean Jan 24, 2023
2d2da92
only support 4844 rpc methods if on 4844
divagant-martian Jan 24, 2023
5b4cd99
Update beacon_node/lighthouse_network/src/rpc/methods.rs
realbigsean Jan 24, 2023
a4ea176
Update beacon_node/beacon_chain/src/beacon_chain.rs
realbigsean Jan 24, 2023
2225e6a
pass in data availability boundary to the get_blobs method
realbigsean Jan 24, 2023
18d4faf
review updates
realbigsean Jan 24, 2023
d3240c1
fix common issue across blocks by range and blobs by range
realbigsean Jan 24, 2023
eabe5dc
Merge pull request #3910 from realbigsean/block-wrapper-refactor
realbigsean Jan 25, 2023
9fde813
Merge pull request #3913 from divagant-martian/reject-pre-fork-rpc-up…
realbigsean Jan 25, 2023
5e8d798
merge conflict resolution
realbigsean Jan 25, 2023
32b0fb1
Merge pull request #3912 from realbigsean/sync-error-handling
realbigsean Jan 25, 2023
8617731
update zip
realbigsean Jan 25, 2023
1dd9812
Merge pull request #3915 from realbigsean/devnetv4-builtin-config
realbigsean Jan 25, 2023
6511d28
Update checkpoint-sync.md (#3831)
Madman600 Jan 16, 2023
bd7bd00
Return HTTP 404 rather than 405 (#3836)
santiagomed Jan 16, 2023
47ade13
Add CLI flag to specify the format of logs written to the logfile (#3…
macladson Jan 16, 2023
1b6d1a9
add better err reporting UnableToOpenVotingKeystore (#3781)
infosecual Jan 17, 2023
12bdde1
add logging for starting request and receiving block (#3858)
GeemoCandama Jan 17, 2023
63593ef
Fix some dead links in markdown files (#3885)
aliask Jan 17, 2023
8e50d31
update antithesis dockerfile (#3883)
realbigsean Jan 20, 2023
528f718
Improve block delay metrics (#3894)
AgeManning Jan 20, 2023
c2f64f8
Switch allocator to jemalloc (#3697)
michaelsproul Jan 20, 2023
9f2bace
fix multiarch docker builds (#3904)
antondlr Jan 20, 2023
a4cfe50
Import BLS to execution changes before Capella (#3892)
michaelsproul Jan 20, 2023
eb9da6c
Use eth1_withdrawal_credentials in Test States (#3898)
ethDreamer Jan 24, 2023
9b5c2ee
Implement sync_committee_rewards API (per-validator reward) (#3903)
ensi321 Jan 24, 2023
f857811
light client optimistic update reprocessing (#3799)
GeemoCandama Jan 24, 2023
550d63f
Update sync rewards API for abstract exec payload
michaelsproul Jan 25, 2023
494a270
Fix the new BLS to execution change test
michaelsproul Jan 25, 2023
17b6a60
Update another test broken by the shuffling change
michaelsproul Jan 25, 2023
7c8d97c
remove unused import
realbigsean Jan 25, 2023
dd512cd
stub out tx root check, fix block hash calculation
realbigsean Jan 27, 2023
2c12200
fix compile
realbigsean Jan 27, 2023
ee25c21
Merge pull request #3921 from realbigsean/cap-4844
realbigsean Jan 27, 2023
2645249
Merge branch 'eip4844' of https://github.com/sigp/lighthouse into fix…
realbigsean Jan 27, 2023
37e7c1d
keep verification of payloads pre 4844
realbigsean Jan 27, 2023
c0bdc1d
Merge pull request #3920 from realbigsean/fix-and-loosen-execution-bl…
realbigsean Jan 27, 2023
9976d3b
send stream terminators
divagant-martian Jan 27, 2023
b7e20fb
Update beacon_node/lighthouse_network/src/rpc/protocol.rs
realbigsean Jan 27, 2023
6d2dff6
Merge pull request #3926 from divagant-martian/stream-timeout-blob-bug
realbigsean Jan 27, 2023
d9e83e6
blob decoding
realbigsean Feb 3, 2023
94a369b
blob tx decoding
realbigsean Feb 5, 2023
90e25dc
from to new
realbigsean Feb 5, 2023
f22aac1
improve error handling
realbigsean Feb 5, 2023
38db8d7
add back in 4844 tx consistencycheck during payload reconstruction
realbigsean Feb 5, 2023
1315098
variable list from -> new
realbigsean Feb 5, 2023
e5896d9
re-order methods
realbigsean Feb 5, 2023
3533ed4
pr feedback and bugfixes
realbigsean Feb 7, 2023
21e5b7f
Merge pull request #3941 from realbigsean/blob-decoding
realbigsean Feb 7, 2023
26a2962
Merge branch 'capella' of https://github.com/sigp/lighthouse into eip…
realbigsean Feb 7, 2023
a42d075
fix compilation issues after merge
realbigsean Feb 7, 2023
4937843
self rate limiting
divagant-martian Feb 7, 2023
8661477
use hex decode instead of parse
realbigsean Feb 8, 2023
e2a6da4
Boiler plate code for blobs pruning
emhane Jan 5, 2023
7bf88c2
Prune blobs before data availability breakpoint
emhane Jan 6, 2023
fe0c911
Plug in pruning of blobs into app
emhane Jan 8, 2023
2a41f25
fixup! Prune blobs before data availability breakpoint
emhane Jan 8, 2023
b88d888
fixup! Plug in pruning of blobs into app
emhane Jan 8, 2023
d21c66d
fixup! Plug in pruning of blobs into app
emhane Jan 8, 2023
934f3ab
Remove inaccurate guess for db index
emhane Jan 8, 2023
d3b94d8
fixup! Prune blobs before data availability breakpoint
emhane Jan 9, 2023
28e1e63
Fix rebase conflict
emhane Feb 6, 2023
a211e6a
Fix rebase conflict
emhane Feb 6, 2023
ce2db35
Fix rebase conflict
emhane Feb 6, 2023
82ffec3
Fix typo
emhane Jan 12, 2023
d67468d
Prune blobs on migration in addition to start-up
emhane Jan 13, 2023
667cca5
Fix try_prune_blobs to use state root
emhane Jan 13, 2023
6f5ca02
Improve syntax
emhane Jan 13, 2023
a2b8c6e
Save fetching state for blobs pruning
emhane Jan 13, 2023
94aa2ce
Log info loaded from disk
emhane Jan 14, 2023
c7f53a9
Delete blobs that conflict with finalization
emhane Jan 14, 2023
8752dee
Store orphan block roots
emhane Jan 14, 2023
2f565d2
Prune blobs in bg after canonical head update
emhane Jan 14, 2023
6346c30
Enable skipping blob pruning at each epoch
emhane Jan 14, 2023
d58a30b
fixup! Store orphan block roots
emhane Jan 14, 2023
fb2ce90
Avoid repeteadly updating blob info for multiple head candidates
emhane Jan 15, 2023
b5abfe6
Convert epochs_per_blob_prune to Epoch once
emhane Jan 16, 2023
0d13932
Fix epoch constructor misconception
emhane Jan 16, 2023
7103a25
Simplify conceptual design
emhane Jan 16, 2023
2056775
fixup! Simplify conceptual design
emhane Jan 16, 2023
44ec331
fixup! Simplify conceptual design
emhane Jan 17, 2023
3d93dad
Fix type bug
emhane Jan 17, 2023
74172ed
Ignore IDE file
emhane Jan 17, 2023
83a9520
Clarify hybrid blob prune solution and fix error handling
emhane Jan 18, 2023
54699f8
fixup! Clarify hybrid blob prune solution and fix error handling
emhane Jan 18, 2023
3bede06
Fix typo
emhane Jan 18, 2023
a875bec
Fix blobs store bug
emhane Jan 18, 2023
caa04db
Run prune blobs on migrator thread
emhane Jan 18, 2023
0bdc291
Only store non-empty orphaned blobs
emhane Jan 19, 2023
d1b75e2
Fix typo
emhane Jan 20, 2023
d7fc24a
Plug in running blob pruning in migrator, related bug fixes and add t…
emhane Jan 20, 2023
1812301
Allow user to set an epoch margin for pruning
emhane Jan 20, 2023
4de523f
fixup! Allow user to set an epoch margin for pruning
emhane Jan 20, 2023
756c881
Keep uniform size small keys
emhane Jan 24, 2023
e4b4473
Clarify wording
emhane Jan 24, 2023
f6346f8
Clarify comment
emhane Jan 24, 2023
c50f831
Fix wording
emhane Jan 24, 2023
63ca3bf
Prune from highest data availability boundary
emhane Jan 24, 2023
43c3c74
fixup! Fix blobs store bug
emhane Jan 24, 2023
d479560
fixup! Prune from highest data availability boundary
emhane Jan 24, 2023
9c2e623
Reflect use of prune margin epochs at import
emhane Jan 24, 2023
5d2480c
Improve naming
emhane Jan 24, 2023
6dff69b
Atomically update blob info with pruned blobs
emhane Jan 24, 2023
9ee9b6d
Remove unused stuff
emhane Jan 24, 2023
1e59cb9
Add tests for blob pruning flags
emhane Jan 24, 2023
a2eda76
Correct comment
emhane Jan 24, 2023
8f137df
fixup! Allow user to set an epoch margin for pruning
emhane Jan 24, 2023
00ca21e
Make implementation of BlobInfo more coder friendly
emhane Jan 24, 2023
b2abec5
Verify StoreConfig
emhane Jan 24, 2023
56c8417
Fix conflicts rebasing eip4844
emhane Feb 6, 2023
577262c
Improve use of whitespace
emhane Feb 7, 2023
d599e41
Remove debug comment
emhane Feb 7, 2023
d7eb944
Reorder loading of db metadata from disk to allow for future changes …
emhane Feb 7, 2023
9d91991
Removed unused code
emhane Feb 7, 2023
ac4b5b5
Fix regression in DB write atomicity
michaelsproul Jan 30, 2023
bc468b4
fixup! Improve use of whitespace
emhane Feb 7, 2023
6a37e84
fixup! Fix regression in DB write atomicity
emhane Feb 7, 2023
dd40adc
check byte length when converting to uint256 and hash256 from bytes. …
realbigsean Feb 8, 2023
902f64a
remove clone of access lists
realbigsean Feb 8, 2023
99da11e
fix lints
realbigsean Feb 8, 2023
4156719
Merge pull request #3852 from emhane/prune_blobs
realbigsean Feb 8, 2023
f973762
Store blobs in separate freezer or historical state freezer
emhane Jan 10, 2023
e0b1a08
fixup! Store blobs in separate freezer or historical state freezer
emhane Jan 10, 2023
05c51b3
fix rebase conflicts
emhane Feb 1, 2023
0ba0775
Help user configure blobs freezer correctly between start ups
emhane Jan 11, 2023
3c0aa20
fixup! Help user configure blobs freezer correctly between start ups
emhane Jan 11, 2023
3679a0f
Improve syntax
emhane Jan 11, 2023
04f635c
Remove IDE file
emhane Jan 17, 2023
625980e
Fix rebase conflicts
emhane Feb 1, 2023
dcb5495
Store blobs in correct db for atomic ops
emhane Jan 17, 2023
22915c2
fixup! Store blobs in correct db for atomic ops
emhane Jan 17, 2023
7f91dd8
Help user choose blobs db
emhane Jan 18, 2023
f8c3e7f
Lint fix
emhane Jan 18, 2023
f971f3a
Fix rebase conflicts
emhane Feb 1, 2023
d8e501d
Add todos
emhane Jan 18, 2023
00ce8d9
Throw error when params don't match with previous run
emhane Jan 31, 2023
04fafeb
fixup! Throw error when params don't match with previous run
emhane Jan 31, 2023
ba88295
Delete blobs along with block
emhane Feb 1, 2023
89cccfc
Fix rebase conflicts
emhane Feb 6, 2023
72cd68c
Complete making blocks and blobs db atomic
emhane Feb 1, 2023
ca934b7
Fix rebase conflicts
emhane Feb 1, 2023
38fe2dc
fixup! Complete making blocks and blobs db atomic
emhane Feb 6, 2023
290e1d2
fixup! Complete making blocks and blobs db atomic
emhane Feb 6, 2023
1300fb7
Fix conflicts from rebasing eip4844
emhane Feb 9, 2023
12720f9
fixup! Help user choose blobs db
emhane Feb 9, 2023
3676ce7
Fix rebase conflicts
emhane Jan 26, 2023
995b271
Fix network block_lookups test
emhane Jan 21, 2023
7220f35
Debug tests
emhane Jan 21, 2023
16cb9cf
fixup! Debug tests
emhane Jan 22, 2023
8365d76
fixup! Debug tests
emhane Jan 22, 2023
69c30bb
Fix release test
emhane Jan 22, 2023
09370e7
Fix rebase conflicts
emhane Jan 26, 2023
50e01be
Add eip4844 fork to tests
emhane Jan 22, 2023
546d63f
Fix rebase conflicts
emhane Jan 26, 2023
9949900
Fix weak_subjectivity_sync test
emhane Jan 25, 2023
d292a3a
Fix conflicts rebasing eip4844
emhane Feb 6, 2023
e9e198a
Fix conflicts rebasing eip4844
emhane Feb 6, 2023
6beca6d
Fix range sync tests
emhane Jan 26, 2023
a68e3ea
pr feedback
realbigsean Feb 10, 2023
7545ae9
fixup! Fix block lookup debug tests
emhane Jan 26, 2023
5437dca
Fix conflicts rebasing eip4844
emhane Feb 6, 2023
4d3ff34
Fixes after rebasing eip4844
emhane Jan 26, 2023
4817188
Fix clippy
emhane Jan 26, 2023
43bf908
Fix release tests
emhane Jan 26, 2023
e0a9cd6
Change CI clippy
emhane Jan 26, 2023
c7b49fe
fixup! Change CI clippy
emhane Jan 26, 2023
2653f88
Fix conflicts rebasing eip4844
emhane Feb 6, 2023
db36eb9
Fix latest clippy lints
emhane Feb 6, 2023
615402a
fixup! Fix conflicts rebasing eip4844
emhane Feb 6, 2023
1f3eef2
Unpin fixed-hash (#3917)
michaelsproul Feb 6, 2023
02cca34
Fix conflicts rebasing eip4844
emhane Feb 8, 2023
0104d61
fixup! Fix latest clippy lints
emhane Feb 8, 2023
3dd42e5
Remove unused dependencies
emhane Feb 9, 2023
d890f2b
Update dependencies (#3946)
michaelsproul Feb 8, 2023
a1768b1
fixup! Update dependencies (#3946)
emhane Feb 10, 2023
d9eed48
fixup! Add tests for blob pruning flags
emhane Feb 10, 2023
28e9f07
Fix lint for prune blobs pr
emhane Feb 10, 2023
d3a09af
Run cargo update
emhane Feb 10, 2023
c6dfa7a
fixup! Add tests for blob pruning flags
emhane Feb 10, 2023
e1cb4b8
Merge pull request #3869 from emhane/blobs_freezer
realbigsean Feb 13, 2023
e58d7e8
Merge pull request #3951 from realbigsean/fix-blob-tx-ssz
realbigsean Feb 13, 2023
28702c9
merge upstream, add back `get_blobs` logic
realbigsean Feb 13, 2023
fc2d07b
allow unused
realbigsean Feb 13, 2023
ad9af6d
complete match for `has_context_bytes`
realbigsean Feb 13, 2023
8f9c5cf
remove unused structs
realbigsean Feb 13, 2023
4c3561d
make batch size check compile time panic
realbigsean Feb 13, 2023
68f2484
make batch size check compile time panic
realbigsean Feb 13, 2023
cd8757d
Revert "make batch size check compile time panic"
realbigsean Feb 13, 2023
d2ecbd9
fix a couple new lints
realbigsean Feb 13, 2023
8200d37
Merge pull request #2 from realbigsean/sean-debug-ci
emhane Feb 14, 2023
810d875
Fix merge conflicts with eip4844
emhane Feb 14, 2023
148385e
Remove unused error
emhane Feb 14, 2023
73c7ad7
Disable use of system time in tests
emhane Feb 14, 2023
9e4abc7
Comment out tests that use system time
emhane Feb 14, 2023
13efd47
fixup! Disable use of system time in tests
emhane Feb 14, 2023
44dbccf
add v3 to capabilities
realbigsean Feb 14, 2023
fd379ae
Upgrade sqlite3
michaelsproul Feb 15, 2023
9fea440
Fix lint
emhane Feb 15, 2023
2672cf4
Better fix for debug tests
emhane Feb 15, 2023
aaf6404
Remove unused generic
emhane Feb 15, 2023
87d1fbe
Merge pull request #3905 from emhane/beacon_chain_tests
realbigsean Feb 15, 2023
b805fa6
merge with upstream
realbigsean Feb 15, 2023
4d0b0f6
merge self limiter
realbigsean Feb 15, 2023
8320b91
merge self limiter
realbigsean Feb 15, 2023
ca8e341
fix compilation after merge
realbigsean Feb 15, 2023
55753f8
bump recursion limit
realbigsean Feb 15, 2023
d93753c
Merge branch 'unstable' into off-4844
divagant-martian Mar 2, 2023
a9be1ea
solve couple of merge conflicts
divagant-martian Mar 2, 2023
20be702
Revert "Use consensus-spec-tests `v1.3.0-rc.3` (#4021)"
divagant-martian Mar 3, 2023
7454284
define BELLATRIX_FORK_EPOCH in scripts/tests/vars.env with same value…
divagant-martian Mar 3, 2023
e602b94
define CAPELLA_FORK_EPOCH in scripts/tests/vars.env with same value a…
divagant-martian Mar 3, 2023
f405feb
define missing vars
divagant-martian Mar 3, 2023
a3862e4
Revert "Clean capella (#4019)"
divagant-martian Mar 3, 2023
6fb1681
Merge branch 'unstable-up-to-clean-capella' into eip4844
divagant-martian Mar 3, 2023
f16e82a
Merge branch 'unstable' into eip4844
divagant-martian Mar 3, 2023
56841bc
fix gitignore
divagant-martian Mar 3, 2023
91a8d45
add missing eip4844 core topics placeholder
divagant-martian Mar 6, 2023
203a9e5
Merge branch 'unstable' into eip4844
divagant-martian Mar 10, 2023
61b12c2
bump up recursion limits by a lot
divagant-martian Mar 10, 2023
9e30c3c
new lints
divagant-martian Mar 10, 2023
ea23d55
more lints
divagant-martian Mar 10, 2023
0ae3078
bump up recursion limits in the sim bin
divagant-martian Mar 10, 2023
7f2e9b8
Merge branch 'unstable' into eip4844
divagant-martian Mar 14, 2023
9974dfe
fix merge mistake
divagant-martian Mar 14, 2023
607242c
Merge branch 'unstable' into eip4844
divagant-martian Mar 17, 2023
7fad926
Merge commit '65a5eb829264cb279ed66814c961991ae3a0a04b' into eip4844
divagant-martian Mar 24, 2023
1b9cfcc
Merge branch 'unstable' into eip4844
divagant-martian Mar 24, 2023
1093ba1
revert change to ef_tests
divagant-martian Mar 24, 2023
9053223
Merge commit '036b797b2c1831352f937356576b3c78c65220ad' into eip4844
divagant-martian Apr 4, 2023
9558c18
Merge commit 'c5383e393acee152e92641ce4699d05913953e70' into eip4844
divagant-martian Apr 4, 2023
3c1a22c
Merge commit '1e029ce5384e911390a513e2d1885532f34a8b2b' into eip4844
divagant-martian Apr 4, 2023
cb81815
Merge branch 'unstable' into eip4844
divagant-martian Apr 4, 2023
32f9ba0
fix merge conflict
divagant-martian Apr 4, 2023
df1da10
Merge branch 'unstable' into eip4844
divagant-martian Apr 10, 2023
689c0f7
Merge branch 'unstable' into eip4844
pawanjay176 Apr 21, 2023
b2ccc82
Fix compiler issues
pawanjay176 Apr 21, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
- unstable
- stable
- capella
- eip4844
tags:
- v*

Expand Down Expand Up @@ -40,6 +41,11 @@ jobs:
run: |
echo "VERSION=capella" >> $GITHUB_ENV
echo "VERSION_SUFFIX=" >> $GITHUB_ENV
- name: Extract version (if eip4844)
if: github.event.ref == 'refs/heads/eip4844'
run: |
echo "VERSION=eip4844" >> $GITHUB_ENV
echo "VERSION_SUFFIX=" >> $GITHUB_ENV
- name: Extract version (if tagged release)
if: startsWith(github.event.ref, 'refs/tags')
run: |
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/local-testnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ jobs:
- name: Install ganache
run: npm install ganache@latest --global

- name: Install GNU sed & GNU grep
run: |
brew install gnu-sed grep
echo "$(brew --prefix)/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH
echo "$(brew --prefix)/opt/grep/libexec/gnubin" >> $GITHUB_PATH
if: matrix.os == 'macos-12'

# https://github.com/actions/cache/blob/main/examples.md#rust---cargo
- uses: actions/cache@v3
id: cache-cargo
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ perf.data*
/bin
genesis.ssz
/clippy.toml
/.cargo

# IntelliJ
/*.iml
.idea
# VSCode
/.vscode
.idea
36 changes: 36 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,12 @@ members = [
"consensus/tree_hash_derive",

"crypto/bls",
"crypto/kzg",
"crypto/eth2_hashing",
"crypto/eth2_key_derivation",
"crypto/eth2_keystore",
"crypto/eth2_wallet",
"crypto/kzg",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^ this is added twice

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍


"lcli",

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM rust:1.68.2-bullseye AS builder
RUN apt-get update && apt-get -y upgrade && apt-get install -y cmake libclang-dev protobuf-compiler
RUN apt-get update && apt-get -y upgrade && apt-get install -y cmake clang libclang-dev protobuf-compiler
COPY . lighthouse
ARG FEATURES
ENV FEATURES $FEATURES
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ PROFILE ?= release

# List of all hard forks. This list is used to set env variables for several tests so that
# they run for different forks.
FORKS=phase0 altair merge capella
FORKS=phase0 altair merge capella eip4844

# Extra flags for Cargo
CARGO_INSTALL_EXTRA_FLAGS?=
Expand Down Expand Up @@ -172,6 +172,7 @@ lint:
cargo clippy --workspace --tests -- \
-D clippy::fn_to_numeric_cast_any \
-D warnings \
-A clippy::uninlined-format-args \
-A clippy::derive_partial_eq_without_eq \
-A clippy::from-over-into \
-A clippy::upper-case-acronyms \
Expand Down
2 changes: 2 additions & 0 deletions beacon_node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ node_test_rig = { path = "../testing/node_test_rig" }

[features]
write_ssz_files = ["beacon_chain/write_ssz_files"] # Writes debugging .ssz files to /tmp during block processing.
spec-minimal = ["beacon_chain/spec-minimal"]

[dependencies]
eth2_config = { path = "../common/eth2_config" }
Expand All @@ -32,6 +33,7 @@ eth2_network_config = { path = "../common/eth2_network_config" }
execution_layer = { path = "execution_layer" }
lighthouse_network = { path = "./lighthouse_network" }
serde = "1.0.116"
serde_json = "1.0.58"
clap_utils = { path = "../common/clap_utils" }
hyper = "0.14.4"
lighthouse_version = { path = "../common/lighthouse_version" }
Expand Down
6 changes: 6 additions & 0 deletions beacon_node/beacon_chain/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,16 @@ default = ["participation_metrics"]
write_ssz_files = [] # Writes debugging .ssz files to /tmp during block processing.
participation_metrics = [] # Exposes validator participation metrics to Prometheus.
fork_from_env = [] # Initialise the harness chain spec from the FORK_NAME env variable
spec-minimal = ["kzg/minimal-spec"]

[dev-dependencies]
maplit = "1.0.2"
environment = { path = "../../lighthouse/environment" }
serde_json = "1.0.58"

[dependencies]
serde_json = "1.0.58"
eth2_network_config = { path = "../../common/eth2_network_config"}
merkle_proof = { path = "../../consensus/merkle_proof" }
store = { path = "../store" }
parking_lot = "0.12.0"
Expand Down Expand Up @@ -49,6 +52,7 @@ lru = "0.7.1"
tempfile = "3.1.0"
bitvec = "0.20.4"
bls = { path = "../../crypto/bls" }
kzg = { path = "../../crypto/kzg" }
safe_arith = { path = "../../consensus/safe_arith" }
fork_choice = { path = "../../consensus/fork_choice" }
task_executor = { path = "../../common/task_executor" }
Expand All @@ -65,6 +69,8 @@ hex = "0.4.2"
exit-future = "0.2.0"
unused_port = {path = "../../common/unused_port"}
oneshot_broadcast = { path = "../../common/oneshot_broadcast" }
slog-term = "2.6.0"
slog-async = "2.5.0"

[[test]]
name = "beacon_chain_tests"
Expand Down
3 changes: 2 additions & 1 deletion beacon_node/beacon_chain/src/beacon_block_streamer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use execution_layer::{ExecutionLayer, ExecutionPayloadBodyV1};
use slog::{crit, debug, Logger};
use std::collections::HashMap;
use std::sync::Arc;
use store::DatabaseBlock;
use store::{DatabaseBlock, ExecutionPayloadEip4844};
use task_executor::TaskExecutor;
use tokio::sync::{
mpsc::{self, UnboundedSender},
Expand Down Expand Up @@ -97,6 +97,7 @@ fn reconstruct_default_header_block<E: EthSpec>(
let payload: ExecutionPayload<E> = match fork {
ForkName::Merge => ExecutionPayloadMerge::default().into(),
ForkName::Capella => ExecutionPayloadCapella::default().into(),
ForkName::Eip4844 => ExecutionPayloadEip4844::default().into(),
ForkName::Base | ForkName::Altair => {
return Err(Error::PayloadReconstruction(format!(
"Block with fork variant {} has execution payload",
Expand Down
Loading