Skip to content

Commit cd0f08b

Browse files
ethDreamerrealbigseanmacladsondapplionpawanjay176
authored
Electra attestation changes (#5697)
* Fix execution integration tests (#5647) * update waiting status * revert to old nethermind version * Add electra presets to beacon API (#5630) * add presets to API * add extra fields to config spec in beacon API * remove unused * add mainnet presets for gnosis and fix minimal preset default values * Rename `Merge` to `Bellatrix` (#5601) * Rename Merge to Bellatrix * Remove tree-hash-cache which got readded from the rebase * Deterministic block generation for tests (#5654) * Deterministic block generation for tests * Electra other containers (#5652) * add new fields to execution payload and header * beacon state changes * partial beacon state * safe arith in upgrade to electra * initialize balances cache in interop genesis state * Revert "initialize balances cache in interop genesis state" This reverts commit c60b522. * always initialize balances cache if necessary in electra upgrade * build cache earlier * fix block test * per fork NUM_FIELDS_POW2 * Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra-other-containers * fix lints * get fields based on post state, as is spec'd * fix type and move cache build * Add more electra helpers (#5653) * Add new helpers * Fix some stuff * Fix compilation errors * lint * Address review * Ignore gossip blob already imported (#5656) * Ignore gossip blob already imported * Beta compiler fix (#5659) * fix beta compiler compilation * remove unused import * Revert "remove unused import" This reverts commit 0bef36b. * Revert "fix beta compiler compilation" This reverts commit 23152cf. * rename ununsed fields * allow dead code on some error variants * remove unused blob download queue * add back debug to backfill error * more allow dead code on errors * fix(validator_client): raise soft fd limit (#4796) * fix(validator_client): raise soft fd limit * Merge branch 'unstable' of https://github.com/sigp/lighthouse into rkrasiuk/raise-vc-fdlimit * cargo lock * Merge branch 'unstable' of https://github.com/sigp/lighthouse into rkrasiuk/raise-vc-fdlimit * Proposer and attester slashing sse events (#5327) * default vc to block v3 endpoint and deprecate block-v3 flag * Merge branch 'unstable' of https://github.com/sigp/lighthouse into unstable * add proposer and attester event variants * add TOOOs * add tests, event triggers * Merge branch 'unstable' of https://github.com/sigp/lighthouse into proposer-and-attester-slashing-sse-events * revert * revert * remove double event tracking * Merge branch 'unstable' into proposer-and-attester-slashing-sse-events * remove todo, fix test * resolve merge conflicts * Merge branch 'proposer-and-attester-slashing-sse-events' of https://github.com/eserilev/lighthouse into proposer-and-attester-slashing-sse-events * leftover debugging * Merge branch 'unstable' of https://github.com/sigp/lighthouse into proposer-and-attester-slashing-sse-events * Merge branch 'unstable' of https://github.com/sigp/lighthouse into proposer-and-attester-slashing-sse-events * pin macos release runner to `macos-13` (#5665) * pin macos release runner to `macos-13` * Update .github/workflows/release.yml * Remove snapshot cache related code (#5661) * Remove snapshot cache and other references. * Fix default state cache size in docs * Remove cache miss comment entirely * Add state cache CLI tests * Uncomment self_hosted_runner after PR Merge #5137 (#5291) * Uncomment self_hosted_runner after PR Merge #5137 * Merge branch 'unstable' into fix_todo * Merge branch 'unstable' of https://github.com/sigp/lighthouse into fix_todo * Only `portable` builds (binaries) (#5615) * release workflow: portable builds by default * Delete outdated comment * Merge branch 'unstable' into portable-builds-binaries # Conflicts: # .github/workflows/release.yml * Merge parent and current sync lookups (#5655) * Drop lookup type trait for a simple arg * Drop reconstructed for processing * Send parent blocks one by one * Merge current and parent lookups * Merge current and parent lookups clean up todos * Merge current and parent lookups tests * Merge remote-tracking branch 'origin/unstable' into sync-merged-lookup * Merge branch 'unstable' of https://github.com/sigp/lighthouse into sync-merged-lookup * fix compile after merge * #5655 pr review (#26) * fix compile after merge * remove todos, fix typos etc * fix compile * stable rng * delete TODO and unfilled out test * make download result a struct * enums instead of bools as params * fix comment * Various fixes * Track ignored child components * Track dropped lookup reason as metric * fix test * add comment describing behavior of avail check error *  update ordering *  delete spammy log (#5672) *  delete spammy log * Ensure block only range requests don't fail on download (#5675) * ensure pruned blobs don't fail on download * Typo * Improve ENR updates (#5483) * Improve ENR updates * forever fmt * Appease my old friend clippy * Merge network unstable * Check da_checker before doing a block lookup request (#5681) * Check da_checker before doing a block lookup request * Ensure consistent handling of lookup result * use req resp pre import cache rather than da checker * Update Cargo.lock (#5670) * update rust-yamux * update Cargo.lock * Merge branch 'unstable' of github.com:jxs/lighthouse into update-cargo * Merge branch 'unstable' of github.com:sigp/lighthouse into update-cargo * update to new libp2p versions * Add metric for current epoch total balance (#5688) * Add metric for current epoch total balance --------- Co-authored-by: realbigsean <[email protected]> Co-authored-by: Mac L <[email protected]> Co-authored-by: Lion - dapplion <[email protected]> Co-authored-by: Pawan Dhananjay <[email protected]> Co-authored-by: Roman Krasiuk <[email protected]> Co-authored-by: Eitan Seri-Levi <[email protected]> Co-authored-by: antondlr <[email protected]> Co-authored-by: Jimmy Chen <[email protected]> Co-authored-by: Ærvin <[email protected]> Co-authored-by: Age Manning <[email protected]> Co-authored-by: João Oliveira <[email protected]> Co-authored-by: Michael Sproul <[email protected]>
1 parent e6c7f14 commit cd0f08b

File tree

156 files changed

+3583
-4040
lines changed

Some content is hidden

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

156 files changed

+3583
-4040
lines changed

‎.github/workflows/release.yml

Lines changed: 30 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -31,38 +31,22 @@ jobs:
3131
strategy:
3232
matrix:
3333
arch: [aarch64-unknown-linux-gnu,
34-
aarch64-unknown-linux-gnu-portable,
3534
x86_64-unknown-linux-gnu,
36-
x86_64-unknown-linux-gnu-portable,
3735
x86_64-apple-darwin,
38-
x86_64-apple-darwin-portable,
39-
x86_64-windows,
40-
x86_64-windows-portable]
36+
x86_64-windows]
4137
include:
4238
- arch: aarch64-unknown-linux-gnu
4339
runner: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "release", "large"]') || 'ubuntu-latest' }}
4440
profile: maxperf
45-
- arch: aarch64-unknown-linux-gnu-portable
46-
runner: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "release", "large"]') || 'ubuntu-latest' }}
47-
profile: maxperf
4841
- arch: x86_64-unknown-linux-gnu
4942
runner: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "release", "large"]') || 'ubuntu-latest' }}
5043
profile: maxperf
51-
- arch: x86_64-unknown-linux-gnu-portable
52-
runner: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "release", "large"]') || 'ubuntu-latest' }}
53-
profile: maxperf
5444
- arch: x86_64-apple-darwin
55-
runner: macos-latest
56-
profile: maxperf
57-
- arch: x86_64-apple-darwin-portable
58-
runner: macos-latest
45+
runner: macos-13
5946
profile: maxperf
6047
- arch: x86_64-windows
6148
runner: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "windows", "release"]') || 'windows-2019' }}
6249
profile: maxperf
63-
- arch: x86_64-windows-portable
64-
runner: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "windows", "release"]') || 'windows-2019' }}
65-
profile: maxperf
6650

6751
runs-on: ${{ matrix.runner }}
6852
needs: extract-version
@@ -90,53 +74,29 @@ jobs:
9074
# Builds
9175
# ==============================
9276

93-
- name: Build Lighthouse for aarch64-unknown-linux-gnu-portable
94-
if: matrix.arch == 'aarch64-unknown-linux-gnu-portable'
95-
run: |
96-
cargo install cross
97-
env CROSS_PROFILE=${{ matrix.profile }} make build-aarch64-portable
98-
9977
- name: Build Lighthouse for aarch64-unknown-linux-gnu
10078
if: matrix.arch == 'aarch64-unknown-linux-gnu'
10179
run: |
10280
cargo install cross
103-
env CROSS_PROFILE=${{ matrix.profile }} make build-aarch64
104-
105-
- name: Build Lighthouse for x86_64-unknown-linux-gnu-portable
106-
if: matrix.arch == 'x86_64-unknown-linux-gnu-portable'
107-
run: |
108-
cargo install cross
109-
env CROSS_PROFILE=${{ matrix.profile }} make build-x86_64-portable
81+
env CROSS_PROFILE=${{ matrix.profile }} make build-aarch64-portable
11082
11183
- name: Build Lighthouse for x86_64-unknown-linux-gnu
11284
if: matrix.arch == 'x86_64-unknown-linux-gnu'
11385
run: |
11486
cargo install cross
115-
env CROSS_PROFILE=${{ matrix.profile }} make build-x86_64
116-
117-
- name: Move cross-compiled binary
118-
if: startsWith(matrix.arch, 'aarch64')
119-
run: mv target/aarch64-unknown-linux-gnu/${{ matrix.profile }}/lighthouse ~/.cargo/bin/lighthouse
87+
env CROSS_PROFILE=${{ matrix.profile }} make build-x86_64-portable
12088
12189
- name: Move cross-compiled binary
122-
if: startsWith(matrix.arch, 'x86_64-unknown-linux-gnu')
123-
run: mv target/x86_64-unknown-linux-gnu/${{ matrix.profile }}/lighthouse ~/.cargo/bin/lighthouse
124-
125-
- name: Build Lighthouse for x86_64-apple-darwin portable
126-
if: matrix.arch == 'x86_64-apple-darwin-portable'
127-
run: cargo install --path lighthouse --force --locked --features portable,gnosis --profile ${{ matrix.profile }}
90+
if: contains(matrix.arch, 'unknown-linux-gnu')
91+
run: mv target/${{ matrix.arch }}/${{ matrix.profile }}/lighthouse ~/.cargo/bin/lighthouse
12892

129-
- name: Build Lighthouse for x86_64-apple-darwin modern
93+
- name: Build Lighthouse for x86_64-apple-darwin
13094
if: matrix.arch == 'x86_64-apple-darwin'
131-
run: cargo install --path lighthouse --force --locked --features modern,gnosis --profile ${{ matrix.profile }}
132-
133-
- name: Build Lighthouse for Windows portable
134-
if: matrix.arch == 'x86_64-windows-portable'
13595
run: cargo install --path lighthouse --force --locked --features portable,gnosis --profile ${{ matrix.profile }}
13696

137-
- name: Build Lighthouse for Windows modern
97+
- name: Build Lighthouse for Windows
13898
if: matrix.arch == 'x86_64-windows'
139-
run: cargo install --path lighthouse --force --locked --features modern,gnosis --profile ${{ matrix.profile }}
99+
run: cargo install --path lighthouse --force --locked --features portable,gnosis --profile ${{ matrix.profile }}
140100

141101
- name: Configure GPG and create artifacts
142102
if: startsWith(matrix.arch, 'x86_64-windows') != true
@@ -151,6 +111,11 @@ jobs:
151111
cd artifacts
152112
tar -czf lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}.tar.gz lighthouse
153113
echo "$GPG_PASSPHRASE" | gpg --passphrase-fd 0 --pinentry-mode loopback --batch -ab lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}.tar.gz
114+
for ext in "tar.gz" "tar.gz.asc";\
115+
do for f in *.$ext;\
116+
do cp $f "../${f%.$ext}-portable.$ext";\
117+
done;\
118+
done
154119
mv *tar.gz* ..
155120
156121
- name: Configure GPG and create artifacts Windows
@@ -179,13 +144,29 @@ jobs:
179144
path: lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}.tar.gz
180145
compression-level: 0
181146

147+
- name: Upload artifact (copy)
148+
if: startsWith(matrix.arch, 'x86_64-windows') != true
149+
uses: actions/upload-artifact@v4
150+
with:
151+
name: lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}-portable.tar.gz
152+
path: lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}-portable.tar.gz
153+
compression-level: 0
154+
182155
- name: Upload signature
183156
uses: actions/upload-artifact@v4
184157
with:
185158
name: lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}.tar.gz.asc
186159
path: lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}.tar.gz.asc
187160
compression-level: 0
188161

162+
- name: Upload signature (copy)
163+
if: startsWith(matrix.arch, 'x86_64-windows') != true
164+
uses: actions/upload-artifact@v4
165+
with:
166+
name: lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}-portable.tar.gz.asc
167+
path: lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}-portable.tar.gz.asc
168+
compression-level: 0
169+
189170
draft-release:
190171
name: Draft Release
191172
needs: [build, extract-version]

‎.github/workflows/test-suite.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,9 +273,7 @@ jobs:
273273
run: |
274274
make
275275
- name: Install lcli
276-
# TODO: uncomment after the version of lcli in https://github.com/sigp/lighthouse/pull/5137
277-
# is installed on the runners
278-
# if: env.SELF_HOSTED_RUNNERS == 'false'
276+
if: env.SELF_HOSTED_RUNNERS == 'false'
279277
run: make install-lcli
280278
- name: Run the doppelganger protection failure test script
281279
run: |

0 commit comments

Comments
 (0)