Skip to content

Commit 6324f3d

Browse files
committed
Merge remote-tracking branch 'upstream' into vui-chee/custom-genesis-number
* upstream: (203 commits) feat(node-core): make rpc server args customizable (paradigmxyz#20312) feat: add `account_history_in_rocksdb` field to `StorageSettings` (paradigmxyz#20282) feat(engine): Add BAL stub methods to ExecutionPayload and BlockOrPayload (paradigmxyz#20311) docs: fix misleading links (paradigmxyz#20300) ci: add more sccache (paradigmxyz#20316) feat: bump alloy-evm (paradigmxyz#20314) feat: allow larger ws frames on client side (paradigmxyz#20307) docs: add architecture diagrams to ExEx documentation (paradigmxyz#20193) feat: add semaphore for blocking IO requests (paradigmxyz#20289) ci: scale down depot runners (paradigmxyz#20295) perf: fetch header directly (paradigmxyz#20294) docs(exex): fix DebugApi comment (paradigmxyz#20296) feat: add support for testing_ rpc namespace and testing_buildBlockV1 (paradigmxyz#20094) chore: update engine_getBlobs metric (paradigmxyz#20290) chore(optimism): move predeploy constant to op-alloy (paradigmxyz#20181) docs: fix stages order and add missing EraStage (paradigmxyz#20283) docs: improve map_add_ons method documentation (paradigmxyz#20248) feat: add `transaction_hash_numbers_in_rocksdb` field to `StorageSettings` (paradigmxyz#20209) docs: clarify network mode, tx gossip and NAT (paradigmxyz#20247) feat: add support for debug_getBadBlock (paradigmxyz#20177) ...
2 parents ed748ce + ed3a8a0 commit 6324f3d

File tree

389 files changed

+24793
-4760
lines changed

Some content is hidden

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

389 files changed

+24793
-4760
lines changed

.config/nextest.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,8 @@ slow-timeout = { period = "2m", terminate-after = 3 }
1919
[[profile.default.overrides]]
2020
filter = "package(reth-era) and binary(it)"
2121
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 }

.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
# include source files
55
!/bin
66
!/crates
7+
!/pkg
78
!/testing
89
!book.toml
910
!Cargo.lock
1011
!Cargo.toml
1112
!Cross.toml
1213
!deny.toml
1314
!Makefile
15+
!README.md
1416

1517
# include for vergen constants
1618
!/.git

.github/actionlint.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
self-hosted-runner:
2+
labels:
3+
- depot-ubuntu-latest
4+
- depot-ubuntu-latest-2
5+
- depot-ubuntu-latest-4
6+
- depot-ubuntu-latest-8
7+
- depot-ubuntu-latest-16

.github/assets/hive/run_simulator.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ sim="${1}"
77
limit="${2}"
88

99
run_hive() {
10-
hive --sim "${sim}" --sim.limit "${limit}" --sim.parallelism 8 --client reth 2>&1 | tee /tmp/log || true
10+
hive --sim "${sim}" --sim.limit "${limit}" --sim.parallelism 16 --client reth 2>&1 | tee /tmp/log || true
1111
}
1212

1313
check_log() {

.github/workflows/bench.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,19 @@ env:
1111
CARGO_TERM_COLOR: always
1212
BASELINE: base
1313
SEED: reth
14+
RUSTC_WRAPPER: "sccache"
1415

1516
name: bench
1617
jobs:
1718
codspeed:
18-
runs-on:
19-
group: Reth
19+
runs-on: depot-ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v5
21+
- uses: actions/checkout@v6
2222
with:
2323
submodules: true
2424
- uses: rui314/setup-mold@v1
2525
- uses: dtolnay/rust-toolchain@stable
26+
- uses: mozilla-actions/[email protected]
2627
- uses: Swatinem/rust-cache@v2
2728
with:
2829
cache-on-failure: true

.github/workflows/book.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,16 @@ on:
1010
types: [opened, reopened, synchronize, closed]
1111
merge_group:
1212

13+
env:
14+
RUSTC_WRAPPER: "sccache"
15+
1316
jobs:
1417
build:
15-
runs-on: ubuntu-latest
18+
runs-on: depot-ubuntu-latest-8
1619
timeout-minutes: 90
1720
steps:
1821
- name: Checkout
19-
uses: actions/checkout@v5
22+
uses: actions/checkout@v6
2023

2124
- name: Install bun
2225
uses: oven-sh/setup-bun@v2
@@ -33,6 +36,8 @@ jobs:
3336
- name: Install Rust nightly
3437
uses: dtolnay/rust-toolchain@nightly
3538

39+
- uses: mozilla-actions/[email protected]
40+
3641
- name: Build docs
3742
run: cd docs/vocs && bash scripts/build-cargo-docs.sh
3843

.github/workflows/compact.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ on:
1313

1414
env:
1515
CARGO_TERM_COLOR: always
16+
RUSTC_WRAPPER: "sccache"
1617

1718
name: compact-codec
1819
jobs:
1920
compact-codec:
20-
runs-on:
21-
group: Reth
21+
runs-on: depot-ubuntu-latest
2222
strategy:
2323
matrix:
2424
bin:
@@ -27,19 +27,20 @@ jobs:
2727
steps:
2828
- uses: rui314/setup-mold@v1
2929
- uses: dtolnay/rust-toolchain@stable
30+
- uses: mozilla-actions/[email protected]
3031
- uses: Swatinem/rust-cache@v2
3132
with:
3233
cache-on-failure: true
3334
- name: Checkout base
34-
uses: actions/checkout@v5
35+
uses: actions/checkout@v6
3536
with:
3637
ref: ${{ github.base_ref || 'main' }}
3738
# On `main` branch, generates test vectors and serializes them to disk using `Compact`.
3839
- name: Generate compact vectors
3940
run: |
4041
${{ matrix.bin }} -- test-vectors compact --write
4142
- name: Checkout PR
42-
uses: actions/checkout@v5
43+
uses: actions/checkout@v6
4344
with:
4445
clean: false
4546
# 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/[email protected]
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

0 commit comments

Comments
 (0)