Skip to content

Commit 6a92512

Browse files
authored
Merge pull request #43 from scroll-tech/chore-merge-upstream-02824da4f
chore: merge upstream 02824da
2 parents 5f1c8e3 + 2d8305b commit 6a92512

File tree

329 files changed

+7402
-5356
lines changed

Some content is hidden

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

329 files changed

+7402
-5356
lines changed

.github/CODEOWNERS

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ crates/fs-util/ @onbjerg @emhane
2020
crates/metrics/ @onbjerg
2121
crates/net/ @emhane @mattsse @Rjected
2222
crates/net/downloaders/ @onbjerg @rkrasiuk @emhane
23-
crates/node/ @mattsse @Rjected @onbjerg
23+
crates/node/ @mattsse @Rjected @onbjerg @emhane @klkvr
2424
crates/optimism/ @mattsse @Rjected @fgimenez @emhane
2525
crates/payload/ @mattsse @Rjected
26-
crates/primitives/ @Rjected
27-
crates/primitives-traits/ @Rjected @joshieDo
26+
crates/primitives/ @Rjected @emhane @mattsse @klkvr
27+
crates/primitives-traits/ @Rjected @joshieDo @emhane @mattsse @klkvr
2828
crates/prune/ @shekhirin @joshieDo
2929
crates/revm/ @mattsse @rakita
3030
crates/rpc/ @mattsse @Rjected @emhane

.github/assets/check_wasm.sh

+2
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ exclude_crates=(
4747
reth-optimism-node
4848
reth-optimism-payload-builder
4949
reth-optimism-rpc
50+
reth-optimism-primitives
5051
reth-rpc
5152
reth-rpc-api
5253
reth-rpc-api-testing-util
@@ -68,6 +69,7 @@ exclude_crates=(
6869
reth-static-file # tokio
6970
reth-transaction-pool # c-kzg
7071
reth-trie-parallel # tokio
72+
reth-testing-utils
7173
)
7274

7375
# Array to hold the results

.github/assets/kurtosis_network_params.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ participants:
22
- el_type: geth
33
cl_type: lighthouse
44
- el_type: reth
5-
el_extra_params:
6-
- --engine.experimental
75
el_image: "ghcr.io/paradigmxyz/reth:kurtosis-ci"
86
cl_type: teku
97
additional_services:

.github/workflows/hive.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ name: hive
55
on:
66
workflow_dispatch:
77
schedule:
8-
# every day
9-
- cron: "0 0 * * *"
8+
# run every 12 hours
9+
- cron: "0 */12 * * *"
1010

1111
env:
1212
CARGO_TERM_COLOR: always

.github/workflows/kurtosis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ name: kurtosis
55
on:
66
workflow_dispatch:
77
schedule:
8-
# every day
9-
- cron: "0 1 * * *"
8+
# run every 12 hours
9+
- cron: "0 */12 * * *"
1010

1111
env:
1212
CARGO_TERM_COLOR: always

.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
- uses: Swatinem/rust-cache@v2
7272
with:
7373
cache-on-failure: true
74-
- uses: dcarbone/install-jq-action@v2
74+
- uses: dcarbone/install-jq-action@v3
7575
- name: Run Wasm checks
7676
run: .github/assets/check_wasm.sh
7777

0 commit comments

Comments
 (0)