Skip to content

Commit 974b335

Browse files
michaelsproulmichaelsproul
committed
Merge remote-tracking branch 'origin/unstable' into jemalloc
2 parents ac205b7 + 480309f commit 974b335

203 files changed

Lines changed: 8928 additions & 4450 deletions

File tree

Some content is hidden

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

‎.github/custom/clippy.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ async-wrapper-methods = [
1616
"task_executor::TaskExecutor::spawn_blocking_handle",
1717
"warp_utils::task::blocking_task",
1818
"warp_utils::task::blocking_json_task",
19+
"beacon_chain::beacon_chain::BeaconChain::spawn_blocking_handle",
1920
"validator_client::http_api::blocking_signed_json_task",
2021
"execution_layer::test_utils::MockServer::new",
2122
"execution_layer::test_utils::MockServer::new_with_config",

‎.github/workflows/local-testnet.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Get latest version of stable Rust
2222
run: rustup update stable
2323
- name: Install Protoc
24-
uses: arduino/setup-protoc@v1
24+
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
2525
with:
2626
repo-token: ${{ secrets.GITHUB_TOKEN }}
2727
- name: Install ganache

‎.github/workflows/release.yml‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ on:
88
env:
99
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
1010
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
11-
REPO_NAME: sigp/lighthouse
12-
IMAGE_NAME: sigp/lighthouse
11+
REPO_NAME: ${{ github.repository_owner }}/lighthouse
12+
IMAGE_NAME: ${{ github.repository_owner }}/lighthouse
1313

1414
jobs:
1515
extract-version:
@@ -63,12 +63,8 @@ jobs:
6363
steps:
6464
- name: Checkout sources
6565
uses: actions/checkout@v3
66-
- name: Build toolchain
67-
uses: actions-rs/toolchain@v1
68-
with:
69-
toolchain: stable
70-
profile: minimal
71-
override: true
66+
- name: Get latest version of stable Rust
67+
run: rustup update stable
7268

7369
# ==============================
7470
# Windows dependencies
@@ -88,7 +84,7 @@ jobs:
8884
# ==============================
8985
- name: Install Protoc
9086
if: contains(matrix.arch, 'darwin') || contains(matrix.arch, 'windows')
91-
uses: arduino/setup-protoc@v1
87+
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
9288
with:
9389
repo-token: ${{ secrets.GITHUB_TOKEN }}
9490

@@ -179,13 +175,13 @@ jobs:
179175
# =======================================================================
180176

181177
- name: Upload artifact
182-
uses: actions/upload-artifact@v2
178+
uses: actions/upload-artifact@v3
183179
with:
184180
name: lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}.tar.gz
185181
path: lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}.tar.gz
186182

187183
- name: Upload signature
188-
uses: actions/upload-artifact@v2
184+
uses: actions/upload-artifact@v3
189185
with:
190186
name: lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}.tar.gz.asc
191187
path: lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}.tar.gz.asc
@@ -208,19 +204,22 @@ jobs:
208204
# ==============================
209205

210206
- name: Download artifacts
211-
uses: actions/download-artifact@v2
207+
uses: actions/download-artifact@v3
212208

213209
# ==============================
214210
# Create release draft
215211
# ==============================
216212

217213
- name: Generate Full Changelog
218214
id: changelog
219-
run: echo "CHANGELOG=$(git log --pretty=format:"- %s" $(git describe --tags --abbrev=0 ${{ env.VERSION }}^)..${{ env.VERSION }})" >> $GITHUB_OUTPUT
215+
run: |
216+
echo "CHANGELOG<<EOF" >> $GITHUB_OUTPUT
217+
echo "$(git log --pretty=format:"- %s" $(git describe --tags --abbrev=0 ${{ env.VERSION }}^)..${{ env.VERSION }})" >> $GITHUB_OUTPUT
218+
echo "EOF" >> $GITHUB_OUTPUT
220219
221220
- name: Create Release Draft
222221
env:
223-
GITHUB_USER: sigp
222+
GITHUB_USER: ${{ github.repository_owner }}
224223
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
225224

226225
# The formatting here is borrowed from OpenEthereum: https://github.com/openethereum/openethereum/blob/main/.github/workflows/build.yml

‎.github/workflows/test-suite.yml‎

Lines changed: 19 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ env:
1212
# Deny warnings in CI
1313
RUSTFLAGS: "-D warnings"
1414
# The Nightly version used for cargo-udeps, might need updating from time to time.
15-
PINNED_NIGHTLY: nightly-2022-11-08
16-
# The version of cargo-udeps to use, might need updating from time to time.
17-
CARGO_UDEPS_VERSION: 0.1.35
15+
PINNED_NIGHTLY: nightly-2022-12-15
16+
# Prevent Github API rate limiting.
17+
LIGHTHOUSE_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1818
jobs:
1919
target-branch-check:
2020
name: target-branch-check
@@ -53,7 +53,7 @@ jobs:
5353
- name: Get latest version of stable Rust
5454
run: rustup update stable
5555
- name: Install Protoc
56-
uses: arduino/setup-protoc@v1
56+
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
5757
with:
5858
repo-token: ${{ secrets.GITHUB_TOKEN }}
5959
- name: Install ganache
@@ -97,7 +97,7 @@ jobs:
9797
- name: Get latest version of stable Rust
9898
run: rustup update stable
9999
- name: Install Protoc
100-
uses: arduino/setup-protoc@v1
100+
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
101101
with:
102102
repo-token: ${{ secrets.GITHUB_TOKEN }}
103103
- name: Run beacon_chain tests for all known forks
@@ -111,7 +111,7 @@ jobs:
111111
- name: Get latest version of stable Rust
112112
run: rustup update stable
113113
- name: Install Protoc
114-
uses: arduino/setup-protoc@v1
114+
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
115115
with:
116116
repo-token: ${{ secrets.GITHUB_TOKEN }}
117117
- name: Run operation_pool tests for all known forks
@@ -135,7 +135,7 @@ jobs:
135135
- name: Get latest version of stable Rust
136136
run: rustup update stable
137137
- name: Install Protoc
138-
uses: arduino/setup-protoc@v1
138+
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
139139
with:
140140
repo-token: ${{ secrets.GITHUB_TOKEN }}
141141
- name: Install ganache
@@ -151,7 +151,7 @@ jobs:
151151
- name: Get latest version of stable Rust
152152
run: rustup update stable
153153
- name: Install Protoc
154-
uses: arduino/setup-protoc@v1
154+
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
155155
with:
156156
repo-token: ${{ secrets.GITHUB_TOKEN }}
157157
- name: Run state_transition_vectors in release.
@@ -165,7 +165,7 @@ jobs:
165165
- name: Get latest version of stable Rust
166166
run: rustup update stable
167167
- name: Install Protoc
168-
uses: arduino/setup-protoc@v1
168+
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
169169
with:
170170
repo-token: ${{ secrets.GITHUB_TOKEN }}
171171
- name: Run consensus-spec-tests with blst, milagro and fake_crypto
@@ -191,7 +191,7 @@ jobs:
191191
- name: Get latest version of stable Rust
192192
run: rustup update stable
193193
- name: Install Protoc
194-
uses: arduino/setup-protoc@v1
194+
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
195195
with:
196196
repo-token: ${{ secrets.GITHUB_TOKEN }}
197197
- name: Install ganache
@@ -207,7 +207,7 @@ jobs:
207207
- name: Get latest version of stable Rust
208208
run: rustup update stable
209209
- name: Install Protoc
210-
uses: arduino/setup-protoc@v1
210+
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
211211
with:
212212
repo-token: ${{ secrets.GITHUB_TOKEN }}
213213
- name: Install ganache
@@ -223,7 +223,7 @@ jobs:
223223
- name: Get latest version of stable Rust
224224
run: rustup update stable
225225
- name: Install Protoc
226-
uses: arduino/setup-protoc@v1
226+
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
227227
with:
228228
repo-token: ${{ secrets.GITHUB_TOKEN }}
229229
- name: Install ganache
@@ -239,7 +239,7 @@ jobs:
239239
- name: Get latest version of stable Rust
240240
run: rustup update stable
241241
- name: Install Protoc
242-
uses: arduino/setup-protoc@v1
242+
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
243243
with:
244244
repo-token: ${{ secrets.GITHUB_TOKEN }}
245245
- name: Install ganache
@@ -255,7 +255,7 @@ jobs:
255255
- name: Get latest version of stable Rust
256256
run: rustup update stable
257257
- name: Install Protoc
258-
uses: arduino/setup-protoc@v1
258+
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
259259
with:
260260
repo-token: ${{ secrets.GITHUB_TOKEN }}
261261
- name: Install ganache
@@ -287,7 +287,7 @@ jobs:
287287
- name: Get latest version of stable Rust
288288
run: rustup update stable
289289
- name: Install Protoc
290-
uses: arduino/setup-protoc@v1
290+
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
291291
with:
292292
repo-token: ${{ secrets.GITHUB_TOKEN }}
293293
- name: Run exec engine integration tests in release
@@ -301,7 +301,7 @@ jobs:
301301
- name: Get latest version of stable Rust
302302
run: rustup update stable
303303
- name: Install Protoc
304-
uses: arduino/setup-protoc@v1
304+
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
305305
with:
306306
repo-token: ${{ secrets.GITHUB_TOKEN }}
307307
- name: Typecheck benchmark code without running it
@@ -315,34 +315,13 @@ jobs:
315315
- name: Get latest version of stable Rust
316316
run: rustup update stable
317317
- name: Install Protoc
318-
uses: arduino/setup-protoc@v1
318+
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
319319
with:
320320
repo-token: ${{ secrets.GITHUB_TOKEN }}
321321
- name: Lint code for quality and style with Clippy
322322
run: make lint
323323
- name: Certify Cargo.lock freshness
324324
run: git diff --exit-code Cargo.lock
325-
disallowed-from-async-lint:
326-
name: disallowed-from-async-lint
327-
runs-on: ubuntu-latest
328-
needs: cargo-fmt
329-
continue-on-error: true
330-
steps:
331-
- uses: actions/checkout@v3
332-
- name: Install SigP Clippy fork
333-
run: |
334-
cd ..
335-
git clone https://github.com/michaelsproul/rust-clippy.git
336-
cd rust-clippy
337-
git checkout 31a49666ccfcd7963b63345d6ce757c373f22c2a
338-
cargo build --release --bin cargo-clippy --bin clippy-driver
339-
cargo build --release --bin cargo-clippy --bin clippy-driver -Zunstable-options --out-dir $(rustc --print=sysroot)/bin
340-
- name: Install Protoc
341-
uses: arduino/setup-protoc@v1
342-
with:
343-
repo-token: ${{ secrets.GITHUB_TOKEN }}
344-
- name: Run Clippy with the disallowed-from-async lint
345-
run: make nightly-lint
346325
check-msrv:
347326
name: check-msrv
348327
runs-on: ubuntu-latest
@@ -352,7 +331,7 @@ jobs:
352331
- name: Install Rust @ MSRV (${{ needs.extract-msrv.outputs.MSRV }})
353332
run: rustup override set ${{ needs.extract-msrv.outputs.MSRV }}
354333
- name: Install Protoc
355-
uses: arduino/setup-protoc@v1
334+
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
356335
with:
357336
repo-token: ${{ secrets.GITHUB_TOKEN }}
358337
- name: Run cargo check
@@ -394,7 +373,7 @@ jobs:
394373
- name: Install Rust (${{ env.PINNED_NIGHTLY }})
395374
run: rustup toolchain install $PINNED_NIGHTLY
396375
- name: Install Protoc
397-
uses: arduino/setup-protoc@v1
376+
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
398377
with:
399378
repo-token: ${{ secrets.GITHUB_TOKEN }}
400379
- name: Install cargo-udeps

0 commit comments

Comments
 (0)