Skip to content

Commit 97d6479

Browse files
authored
Merge branch 'main' into ab-deb-packaging
2 parents 268db54 + 07c5956 commit 97d6479

File tree

464 files changed

+20879
-6396
lines changed

Some content is hidden

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

464 files changed

+20879
-6396
lines changed

.config/nextest.toml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,12 @@ slow-timeout = { period = "2m", terminate-after = 10 }
1515
[[profile.default.overrides]]
1616
filter = "binary(e2e_testsuite)"
1717
slow-timeout = { period = "2m", terminate-after = 3 }
18+
19+
[[profile.default.overrides]]
20+
filter = "package(reth-era) and binary(it)"
21+
slow-timeout = { period = "2m", terminate-after = 10 }
22+
23+
# Allow slower ethereum node e2e tests (p2p + blobs) to run up to 5 minutes.
24+
[[profile.default.overrides]]
25+
filter = "package(reth-node-ethereum) and binary(e2e)"
26+
slow-timeout = { period = "1m", terminate-after = 5 }

.config/zepter.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ workflows:
1212
# Check that `A` activates the features of `B`.
1313
"propagate-feature",
1414
# These are the features to check:
15-
"--features=std,op,dev,asm-keccak,jemalloc,jemalloc-prof,tracy-allocator,serde-bincode-compat,serde,test-utils,arbitrary,bench,alloy-compat,min-error-logs,min-warn-logs,min-info-logs,min-debug-logs,min-trace-logs,otlp,js-tracer",
15+
"--features=std,op,dev,asm-keccak,jemalloc,jemalloc-prof,tracy-allocator,serde-bincode-compat,serde,test-utils,arbitrary,bench,alloy-compat,min-error-logs,min-warn-logs,min-info-logs,min-debug-logs,min-trace-logs,otlp,js-tracer,portable",
1616
# Do not try to add a new section to `[features]` of `A` only because `B` exposes that feature. There are edge-cases where this is still needed, but we can add them manually.
1717
"--left-side-feature-missing=ignore",
1818
# Ignore the case that `A` it outside of the workspace. Otherwise it will report errors in external dependencies that we have no influence on.

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@ crates/tasks/ @mattsse
4040
crates/tokio-util/ @fgimenez
4141
crates/transaction-pool/ @mattsse @yongkangc
4242
crates/trie/ @Rjected @shekhirin @mediocregopher
43+
bin/reth-bench-compare/ @mediocregopher @shekhirin @yongkangc
4344
etc/ @Rjected @shekhirin
4445
.github/ @gakonst @DaniPopes

.github/workflows/bench.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on:
1919
group: Reth
2020
steps:
21-
- uses: actions/checkout@v5
21+
- uses: actions/checkout@v6
2222
with:
2323
submodules: true
2424
- uses: rui314/setup-mold@v1

.github/workflows/book.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
timeout-minutes: 90
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v5
19+
uses: actions/checkout@v6
2020

2121
- name: Install bun
2222
uses: oven-sh/setup-bun@v2

.github/workflows/compact.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ jobs:
3131
with:
3232
cache-on-failure: true
3333
- name: Checkout base
34-
uses: actions/checkout@v5
34+
uses: actions/checkout@v6
3535
with:
3636
ref: ${{ github.base_ref || 'main' }}
3737
# On `main` branch, generates test vectors and serializes them to disk using `Compact`.
3838
- name: Generate compact vectors
3939
run: |
4040
${{ matrix.bin }} -- test-vectors compact --write
4141
- name: Checkout PR
42-
uses: actions/checkout@v5
42+
uses: actions/checkout@v6
4343
with:
4444
clean: false
4545
# On incoming merge try to read and decode previously generated vectors with `Compact`

.github/workflows/docker-git.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: 'Build and push the git-sha-tagged op-reth image'
3434
command: 'make IMAGE_NAME=$OP_IMAGE_NAME DOCKER_IMAGE_NAME=$OP_DOCKER_IMAGE_NAME GIT_SHA=$GIT_SHA PROFILE=maxperf op-docker-build-push-git-sha'
3535
steps:
36-
- uses: actions/checkout@v5
36+
- uses: actions/checkout@v6
3737
- uses: rui314/setup-mold@v1
3838
- uses: dtolnay/rust-toolchain@stable
3939
- uses: Swatinem/rust-cache@v2

.github/workflows/docker-nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: 'Build and push the nightly profiling op-reth image'
3636
command: 'make IMAGE_NAME=$OP_IMAGE_NAME DOCKER_IMAGE_NAME=$OP_DOCKER_IMAGE_NAME PROFILE=profiling op-docker-build-push-nightly-profiling'
3737
steps:
38-
- uses: actions/checkout@v5
38+
- uses: actions/checkout@v6
3939
- name: Remove bloatware
4040
uses: laverdet/remove-bloatware@v1.0.0
4141
with:

.github/workflows/docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: "Build and push op-reth image"
3333
command: "make IMAGE_NAME=$OP_IMAGE_NAME DOCKER_IMAGE_NAME=$OP_DOCKER_IMAGE_NAME PROFILE=maxperf op-docker-build-push"
3434
steps:
35-
- uses: actions/checkout@v5
35+
- uses: actions/checkout@v6
3636
- uses: rui314/setup-mold@v1
3737
- uses: dtolnay/rust-toolchain@stable
3838
- uses: Swatinem/rust-cache@v2
@@ -68,7 +68,7 @@ jobs:
6868
- name: "Build and push op-reth image"
6969
command: "make IMAGE_NAME=$OP_IMAGE_NAME DOCKER_IMAGE_NAME=$OP_DOCKER_IMAGE_NAME PROFILE=maxperf op-docker-build-push-latest"
7070
steps:
71-
- uses: actions/checkout@v5
71+
- uses: actions/checkout@v6
7272
- uses: rui314/setup-mold@v1
7373
- uses: dtolnay/rust-toolchain@stable
7474
- uses: Swatinem/rust-cache@v2

.github/workflows/e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
RUST_BACKTRACE: 1
2626
timeout-minutes: 90
2727
steps:
28-
- uses: actions/checkout@v5
28+
- uses: actions/checkout@v6
2929
- uses: dtolnay/rust-toolchain@stable
3030
- uses: taiki-e/install-action@nextest
3131
- uses: Swatinem/rust-cache@v2

0 commit comments

Comments
 (0)