Skip to content

Commit 9f9f723

Browse files
authored
Merge branch 'paradigmxyz:main' into main
2 parents afc40f3 + 98b214f commit 9f9f723

File tree

448 files changed

+12052
-9659
lines changed

Some content is hidden

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

448 files changed

+12052
-9659
lines changed

.github/CODEOWNERS

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
bin/ @onbjerg
33
crates/blockchain-tree/ @rakita @rkrasiuk @mattsse @Rjected
44
crates/blockchain-tree-api/ @rakita @rkrasiuk @mattsse @Rjected
5-
crates/chainspec/ @Rjected @joshieDo @mattsse
5+
crates/chainspec/ @Rjected @joshieDo @mattsse @emhane
66
crates/chain-state/ @fgimenez @mattsse @rkrasiuk
77
crates/cli/ @onbjerg @mattsse
88
crates/config/ @onbjerg
@@ -21,7 +21,7 @@ crates/metrics/ @onbjerg
2121
crates/net/ @emhane @mattsse @Rjected
2222
crates/net/downloaders/ @onbjerg @rkrasiuk @emhane
2323
crates/node/ @mattsse @Rjected @onbjerg
24-
crates/optimism/ @mattsse @Rjected @fgimenez
24+
crates/optimism/ @mattsse @Rjected @fgimenez @emhane
2525
crates/payload/ @mattsse @Rjected
2626
crates/primitives/ @Rjected
2727
crates/primitives-traits/ @Rjected @joshieDo

.github/assets/check_wasm.sh

+7-8
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ exclude_crates=(
4343
reth-net-nat
4444
reth-network
4545
reth-node-api
46+
reth-node-types
4647
reth-node-builder
4748
reth-node-core
4849
reth-node-ethereum
@@ -66,18 +67,16 @@ exclude_crates=(
6667
reth-stages
6768
reth-storage-errors
6869
# The following are not supposed to be working
69-
reth # all of the crates below
70-
reth-db # mdbx
70+
reth # all of the crates below
71+
reth-invalid-block-hooks # reth-provider
7172
reth-libmdbx # mdbx
7273
reth-mdbx-sys # mdbx
73-
reth-nippy-jar # sucds
74-
reth-provider # reth-db, reth-nippy-jar
75-
reth-prune # reth-db
74+
reth-provider # tokio
75+
reth-prune # tokio
7676
reth-stages-api # reth-provider, reth-prune
77-
reth-static-file # reth-nippy-jar
77+
reth-static-file # tokio
7878
reth-transaction-pool # c-kzg
79-
reth-trie-db # reth-db
80-
reth-trie-parallel # reth-db
79+
reth-trie-parallel # tokio
8180
)
8281

8382
# Array to hold the results

.github/assets/hive/expected_failures.yaml

-6
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ rpc-compat:
77
- debug_getRawTransaction/get-invalid-hash (reth)
88

99
- eth_call/call-callenv (reth)
10-
- eth_createAccessList/create-al-contract-eip1559 (reth)
11-
- eth_createAccessList/create-al-contract (reth)
1210
- eth_feeHistory/fee-history (reth)
1311
- eth_getStorageAt/get-storage-invalid-key-too-large (reth)
1412
- eth_getStorageAt/get-storage-invalid-key (reth)
@@ -48,8 +46,6 @@ engine-api:
4846
- Invalid Missing Ancestor Syncing ReOrg, StateRoot, EmptyTxs=False, CanonicalReOrg=False, Invalid P9 (Paris) (reth)
4947
- Invalid Missing Ancestor Syncing ReOrg, StateRoot, EmptyTxs=True, CanonicalReOrg=True, Invalid P9 (Paris) (reth)
5048
- Invalid Missing Ancestor Syncing ReOrg, StateRoot, EmptyTxs=False, CanonicalReOrg=True, Invalid P9 (Paris) (reth)
51-
- Invalid Missing Ancestor Syncing ReOrg, GasLimit, EmptyTxs=False, CanonicalReOrg=False, Invalid P8 (Paris) (reth)
52-
- Invalid Missing Ancestor Syncing ReOrg, Timestamp, EmptyTxs=False, CanonicalReOrg=False, Invalid P8 (Paris) (reth)
5349

5450
# https://github.com/paradigmxyz/reth/issues/8305
5551
# https://github.com/paradigmxyz/reth/issues/6217
@@ -65,8 +61,6 @@ engine-cancun:
6561
- Invalid Missing Ancestor Syncing ReOrg, StateRoot, EmptyTxs=False, CanonicalReOrg=False, Invalid P9 (Cancun) (reth)
6662
- Invalid Missing Ancestor Syncing ReOrg, StateRoot, EmptyTxs=True, CanonicalReOrg=True, Invalid P9 (Cancun) (reth)
6763
- Invalid Missing Ancestor Syncing ReOrg, StateRoot, EmptyTxs=False, CanonicalReOrg=True, Invalid P9 (Cancun) (reth)
68-
- Invalid Missing Ancestor Syncing ReOrg, GasLimit, EmptyTxs=False, CanonicalReOrg=False, Invalid P8 (Cancun) (reth)
69-
- Invalid Missing Ancestor Syncing ReOrg, Timestamp, EmptyTxs=False, CanonicalReOrg=False, Invalid P8 (Cancun) (reth)
7064
- Invalid PayloadAttributes, Missing BeaconRoot, Syncing=True (Cancun) (reth)
7165
- Invalid NewPayload, ParentBeaconBlockRoot, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
7266
- Invalid NewPayload, BlobGasUsed, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)

.github/assets/hive/expected_failures_experimental.yaml

-9
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ rpc-compat:
77
- debug_getRawTransaction/get-invalid-hash (reth)
88

99
- eth_call/call-callenv (reth)
10-
- eth_createAccessList/create-al-contract-eip1559 (reth)
11-
- eth_createAccessList/create-al-contract (reth)
1210
- eth_feeHistory/fee-history (reth)
1311
- eth_getStorageAt/get-storage-invalid-key-too-large (reth)
1412
- eth_getStorageAt/get-storage-invalid-key (reth)
@@ -40,10 +38,6 @@ engine-withdrawals:
4038
# https://github.com/paradigmxyz/reth/issues/8305
4139
# https://github.com/paradigmxyz/reth/issues/6217
4240
engine-api:
43-
- Invalid Missing Ancestor Syncing ReOrg, GasLimit, EmptyTxs=False, CanonicalReOrg=False, Invalid P8 (Paris) (reth)
44-
- Invalid Missing Ancestor Syncing ReOrg, Timestamp, EmptyTxs=False, CanonicalReOrg=False, Invalid P8 (Paris) (reth)
45-
- Invalid Missing Ancestor Syncing ReOrg, Transaction Nonce, EmptyTxs=False, CanonicalReOrg=True, Invalid P8 (Paris) (reth)
46-
- Re-org to Previously Validated Sidechain Payload (Paris) (reth)
4741
- Invalid Missing Ancestor ReOrg, StateRoot, EmptyTxs=False, Invalid P9 (Paris) (reth)
4842
- Invalid Missing Ancestor ReOrg, StateRoot, EmptyTxs=True, Invalid P9 (Paris) (reth)
4943
- Invalid Missing Ancestor ReOrg, StateRoot, EmptyTxs=False, Invalid P10 (Paris) (reth)
@@ -55,13 +49,10 @@ engine-api:
5549
# https://github.com/paradigmxyz/reth/issues/7144
5650
engine-cancun:
5751
- Blob Transaction Ordering, Multiple Clients (Cancun) (reth)
58-
- Invalid Missing Ancestor Syncing ReOrg, GasLimit, EmptyTxs=False, CanonicalReOrg=False, Invalid P8 (Cancun) (reth)
59-
- Invalid Missing Ancestor Syncing ReOrg, Timestamp, EmptyTxs=False, CanonicalReOrg=False, Invalid P8 (Cancun) (reth)
6052
- Invalid PayloadAttributes, Missing BeaconRoot, Syncing=True (Cancun) (reth)
6153
- Invalid NewPayload, BlobGasUsed, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
6254
- Invalid NewPayload, Blob Count on BlobGasUsed, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
6355
- Invalid NewPayload, ExcessBlobGas, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth)
64-
- Re-org to Previously Validated Sidechain Payload (Cancun) (reth)
6556
- Invalid Missing Ancestor ReOrg, StateRoot, EmptyTxs=False, Invalid P9 (Cancun) (reth)
6657
- Invalid Missing Ancestor ReOrg, StateRoot, EmptyTxs=True, Invalid P9 (Cancun) (reth)
6758
- Invalid Missing Ancestor ReOrg, StateRoot, EmptyTxs=False, Invalid P10 (Cancun) (reth)

.github/workflows/lint.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ jobs:
7171
- uses: Swatinem/rust-cache@v2
7272
with:
7373
cache-on-failure: true
74-
- run: cargo hack check
74+
- run: cargo hack check --workspace --exclude op-reth
75+
- run: cargo check -p op-reth --features "optimism"
7576

7677
msrv:
7778
name: MSRV / ${{ matrix.network }}

.github/workflows/op-sync.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ jobs:
3333
with:
3434
cache-on-failure: true
3535
- name: Build op-reth
36-
run: |
37-
cargo install --features asm-keccak,jemalloc,optimism --bin op-reth --path bin/reth
36+
run: make install-op
3837
- name: Run sync
3938
# https://basescan.org/block/10000
4039
run: |

0 commit comments

Comments
 (0)