Skip to content

Commit a160995

Browse files
authored
Merge branch 'paradigmxyz:main' into main
2 parents c65de3b + 33d5eb3 commit a160995

File tree

914 files changed

+25978
-17584
lines changed

Some content is hidden

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

914 files changed

+25978
-17584
lines changed

.github/assets/check_wasm.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ exclude_crates=(
3535
reth-ethereum-payload-builder
3636
reth-etl
3737
reth-evm-ethereum
38-
reth-evm-optimism
3938
reth-execution-errors
4039
reth-exex
4140
reth-exex-test-utils
@@ -49,8 +48,9 @@ exclude_crates=(
4948
reth-node-ethereum
5049
reth-node-events
5150
reth-node-metrics
52-
reth-node-optimism
5351
reth-optimism-cli
52+
reth-optimism-evm
53+
reth-optimism-node
5454
reth-optimism-payload-builder
5555
reth-optimism-rpc
5656
reth-payload-builder
@@ -66,6 +66,7 @@ exclude_crates=(
6666
reth-rpc-types
6767
reth-stages
6868
reth-storage-errors
69+
reth-engine-local
6970
# The following are not supposed to be working
7071
reth # all of the crates below
7172
reth-invalid-block-hooks # reth-provider

.github/assets/hive/expected_failures.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ rpc-compat:
1919
- eth_getBlockByNumber/get-genesis (reth)
2020
- eth_getBlockByNumber/get-latest (reth)
2121
- eth_getBlockByNumber/get-safe (reth)
22-
- eth_sendRawTransaction/send-blob-tx (reth)
2322

24-
# https://github.com/paradigmxyz/reth/issues/8732
23+
# https://github.com/paradigmxyz/reth/issues/8732
2524
engine-withdrawals:
2625
- Withdrawals Fork On Genesis (Paris) (reth)
2726
- Withdrawals Fork on Block 1 (Paris) (reth)

.github/assets/hive/expected_failures_experimental.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ rpc-compat:
1919
- eth_getBlockByNumber/get-genesis (reth)
2020
- eth_getBlockByNumber/get-latest (reth)
2121
- eth_getBlockByNumber/get-safe (reth)
22-
- eth_sendRawTransaction/send-blob-tx (reth)
2322

2423
# https://github.com/paradigmxyz/reth/issues/8732
2524
engine-withdrawals:

.github/workflows/bench.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Runs benchmarks.
1+
# Runs benchmarks on serialization/deserialization of storage values and keys.
22

33
on:
44
pull_request:
@@ -48,13 +48,16 @@ jobs:
4848
uses: actions/checkout@v4
4949
with:
5050
ref: ${{ github.base_ref || 'main' }}
51+
# On `main` branch, generates test vectors and serializes them to disk using `serde-json`.
5152
- name: Generate test vectors
5253
run: cargo run --bin reth --features dev -- test-vectors tables
54+
# Runs iai and stores `main` baseline report for comparison later on $BASELINE.
5355
- name: Save baseline
5456
run: cargo bench -p reth-db --bench iai --profile profiling --features test-utils -- --save-baseline=$BASELINE
5557
- name: Checkout PR
5658
uses: actions/checkout@v4
5759
with:
5860
clean: false
61+
# Runs iai on incoming merge using previously generated test-vectors and compares the report against `main` report.
5962
- name: Compare PR benchmarks
6063
run: cargo bench -p reth-db --bench iai --profile profiling --features test-utils -- --baseline=$BASELINE

.github/workflows/hive.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,3 +264,9 @@ jobs:
264264
with:
265265
webhook-url: ${{ secrets.RETH_ALERTS_WEBHOOK }}
266266
content: "Failed run: https://github.com/paradigmxyz/reth/actions/runs/${{ github.run_id }}"
267+
- name: Slack Webhook Action
268+
uses: rtCamp/action-slack-notify@v2
269+
env:
270+
SLACK_COLOR: ${{ job.status }}
271+
SLACK_MESSAGE: "Failed run: https://github.com/paradigmxyz/reth/actions/runs/${{ github.run_id }}"
272+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
name: Run tests
4848
run: |
4949
cargo nextest run \
50-
--locked -p reth-node-optimism --features "optimism"
50+
--locked -p reth-optimism-node --features "optimism"
5151
5252
integration-success:
5353
name: integration success

.github/workflows/lint.yml

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,18 @@ jobs:
2424
steps:
2525
- uses: actions/checkout@v4
2626
- uses: dtolnay/rust-toolchain@clippy
27+
with:
28+
toolchain: nightly-2024-09-25
29+
components: clippy
2730
- uses: Swatinem/rust-cache@v2
2831
with:
2932
cache-on-failure: true
30-
- run: cargo clippy --bin "${{ matrix.binary }}" --workspace --features "${{ matrix.network }} asm-keccak jemalloc jemalloc-prof min-error-logs min-warn-logs min-info-logs min-debug-logs min-trace-logs"
33+
- name: Run clippy on binaries
34+
run: cargo clippy --bin "${{ matrix.binary }}" --workspace --features "${{ matrix.network }} asm-keccak jemalloc jemalloc-prof min-error-logs min-warn-logs min-info-logs min-debug-logs min-trace-logs"
35+
env:
36+
RUSTFLAGS: -D warnings
37+
- name: Run clippy on book binary sources
38+
run: cargo clippy --manifest-path book/sources/Cargo.toml --workspace --bins
3139
env:
3240
RUSTFLAGS: -D warnings
3341

@@ -39,7 +47,7 @@ jobs:
3947
- uses: actions/checkout@v4
4048
- uses: dtolnay/rust-toolchain@nightly
4149
with:
42-
toolchain: nightly-2024-09-09
50+
toolchain: nightly-2024-09-25
4351
components: clippy
4452
- uses: Swatinem/rust-cache@v2
4553
with:
@@ -125,7 +133,23 @@ jobs:
125133
- uses: dtolnay/rust-toolchain@nightly
126134
with:
127135
components: rustfmt
128-
- run: cargo fmt --all --check
136+
- name: Run fmt
137+
run: cargo fmt --all --check
138+
- name: Run fmt on book sources
139+
run: cargo fmt --manifest-path book/sources/Cargo.toml --all --check
140+
141+
udeps:
142+
name: udeps
143+
runs-on: ubuntu-latest
144+
timeout-minutes: 30
145+
steps:
146+
- uses: actions/checkout@v4
147+
- uses: dtolnay/rust-toolchain@nightly
148+
- uses: Swatinem/rust-cache@v2
149+
with:
150+
cache-on-failure: true
151+
- uses: taiki-e/install-action@cargo-udeps
152+
- run: cargo udeps --workspace --lib --examples --tests --benches --all-features --locked
129153

130154
book:
131155
name: book
@@ -203,6 +227,7 @@ jobs:
203227
- crate-checks
204228
- docs
205229
- fmt
230+
- udeps
206231
- book
207232
- codespell
208233
- grafana

.github/workflows/unit.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ jobs:
4242
--workspace --exclude ef-tests \
4343
--partition hash:${{ matrix.partition }}/2 \
4444
-E "!kind(test)"
45+
- name: Run tests on book sources
46+
run: |
47+
cargo nextest run \
48+
--manifest-path book/sources/Cargo.toml --workspace \
49+
-E "!kind(test)"
4550
4651
state:
4752
name: Ethereum state tests

.github/workflows/windows.yml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# Windows build
2+
3+
name: windows
4+
5+
on:
6+
push:
7+
branches: [main]
8+
pull_request:
9+
branches: [main]
10+
merge_group:
11+
12+
jobs:
13+
check-reth:
14+
runs-on: ubuntu-20.04
15+
timeout-minutes: 60
16+
17+
steps:
18+
- uses: actions/checkout@v4
19+
- uses: dtolnay/rust-toolchain@stable
20+
with:
21+
target: x86_64-pc-windows-gnu
22+
- uses: taiki-e/install-action@cross
23+
- uses: Swatinem/rust-cache@v2
24+
with:
25+
cache-on-failure: true
26+
- name: mingw-w64
27+
run: sudo apt-get install -y mingw-w64
28+
- name: Check Reth
29+
run: cargo check --target x86_64-pc-windows-gnu
30+
31+
check-op-reth:
32+
runs-on: ubuntu-20.04
33+
timeout-minutes: 60
34+
35+
steps:
36+
- uses: actions/checkout@v4
37+
- uses: dtolnay/rust-toolchain@stable
38+
with:
39+
target: x86_64-pc-windows-gnu
40+
- uses: taiki-e/install-action@cross
41+
- uses: Swatinem/rust-cache@v2
42+
with:
43+
cache-on-failure: true
44+
- name: mingw-w64
45+
run: sudo apt-get install -y mingw-w64
46+
- name: Check OP-Reth
47+
run: cargo check -p op-reth --features optimism --target x86_64-pc-windows-gnu

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,7 @@ jwttoken/
4949
crates/storage/libmdbx-rs/mdbx-sys/libmdbx/cmake-build-debug
5050

5151
# Rust bug report
52-
rustc-ice-*
52+
rustc-ice-*
53+
54+
# Book sources should be able to build with the latest version
55+
book/sources/Cargo.lock

0 commit comments

Comments
 (0)