Skip to content

Commit ffcad79

Browse files
author
David.za
committed
Merge branch 'upstream'
2 parents 03c7cfb + 39f1ee8 commit ffcad79

81 files changed

Lines changed: 1553 additions & 1826 deletions

File tree

Some content is hidden

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

.codespellrc

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/assets/check_wasm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ exclude_crates=(
6060
reth-ress-provider
6161
# The following are not supposed to be working
6262
reth # all of the crates below
63-
reth-alloy-provider
63+
reth-storage-rpc-provider
6464
reth-invalid-block-hooks # reth-provider
6565
reth-libmdbx # mdbx
6666
reth-mdbx-sys # mdbx

.github/assets/hive/expected_failures.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ rpc-compat:
66
- debug_getRawReceipts/get-block-n (reth)
77
- debug_getRawTransaction/get-invalid-hash (reth)
88

9-
- eth_call/call-callenv (reth)
109
- eth_getStorageAt/get-storage-invalid-key-too-large (reth)
1110
- eth_getStorageAt/get-storage-invalid-key (reth)
1211
- eth_getTransactionReceipt/get-access-list (reth)

.github/workflows/lint.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,14 +188,12 @@ jobs:
188188
- name: Check docs changes
189189
run: git diff --exit-code
190190

191-
codespell:
191+
typos:
192192
runs-on: ubuntu-latest
193193
timeout-minutes: 30
194194
steps:
195195
- uses: actions/checkout@v4
196-
- uses: codespell-project/actions-codespell@v2
197-
with:
198-
skip: "*.json"
196+
- uses: crate-ci/typos@v1
199197

200198
check-toml:
201199
runs-on: ubuntu-latest
@@ -278,7 +276,7 @@ jobs:
278276
- fmt
279277
- udeps
280278
- book
281-
- codespell
279+
- typos
282280
- grafana
283281
- no-test-deps
284282
- features

Cargo.lock

Lines changed: 37 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ exclude = [".github/"]
1111
members = [
1212
"bin/reth-bench/",
1313
"bin/reth/",
14-
"crates/alloy-provider/",
14+
"crates/storage/rpc-provider/",
1515
"crates/chain-state/",
1616
"crates/chainspec/",
1717
"crates/cli/cli/",
@@ -323,7 +323,7 @@ codegen-units = 1
323323
# reth
324324
op-reth = { path = "crates/optimism/bin" }
325325
reth = { path = "bin/reth" }
326-
reth-alloy-provider = { path = "crates/alloy-provider" }
326+
reth-storage-rpc-provider = { path = "crates/storage/rpc-provider" }
327327
reth-basic-payload-builder = { path = "crates/payload/basic" }
328328
reth-bench = { path = "bin/reth-bench" }
329329
reth-chain-state = { path = "crates/chain-state" }
@@ -465,13 +465,13 @@ revm-context = { version = "8.0.2", default-features = false }
465465
revm-context-interface = { version = "8.0.1", default-features = false }
466466
revm-database-interface = { version = "7.0.1", default-features = false }
467467
op-revm = { version = "8.0.3", default-features = false }
468-
revm-inspectors = "0.26.5"
468+
revm-inspectors = "0.27.1"
469469

470470
# eth
471471
alloy-chains = { version = "0.2.5", default-features = false }
472472
alloy-dyn-abi = "1.2.0"
473473
alloy-eip2124 = { version = "0.2.0", default-features = false }
474-
alloy-evm = { version = "0.14", default-features = false }
474+
alloy-evm = { version = "0.15", default-features = false }
475475
alloy-primitives = { version = "1.2.0", default-features = false, features = ["map-foldhash"] }
476476
alloy-rlp = { version = "0.3.10", default-features = false, features = ["core-net"] }
477477
alloy-sol-macro = "1.2.0"
@@ -509,7 +509,7 @@ alloy-transport-ipc = { version = "1.0.22", default-features = false }
509509
alloy-transport-ws = { version = "1.0.22", default-features = false }
510510

511511
# op
512-
alloy-op-evm = { version = "0.14", default-features = false }
512+
alloy-op-evm = { version = "0.15", default-features = false }
513513
alloy-op-hardforks = "0.2.2"
514514
op-alloy-rpc-types = { version = "0.18.11", default-features = false }
515515
op-alloy-rpc-types-engine = { version = "0.18.11", default-features = false }

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -415,12 +415,12 @@ clippy-op-dev:
415415
--locked \
416416
--all-features
417417

418-
lint-codespell: ensure-codespell
419-
codespell --skip "*.json" --skip "./testing/ef-tests/ethereum-tests"
418+
lint-typos: ensure-typos
419+
typos
420420

421-
ensure-codespell:
422-
@if ! command -v codespell &> /dev/null; then \
423-
echo "codespell not found. Please install it by running the command `pip install codespell` or refer to the following link for more information: https://github.com/codespell-project/codespell" \
421+
ensure-typos:
422+
@if ! command -v typos &> /dev/null; then \
423+
echo "typos not found. Please install it by running the command `cargo install typos-cli` or refer to the following link for more information: https://github.com/crate-ci/typos" \
424424
exit 1; \
425425
fi
426426

@@ -446,7 +446,7 @@ ensure-dprint:
446446
lint:
447447
make fmt && \
448448
make clippy && \
449-
make lint-codespell && \
449+
make lint-typos && \
450450
make lint-toml
451451

452452
clippy-fix:

bin/reth-bench/src/bench/context.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,16 @@ impl BenchContext {
3636
pub(crate) async fn new(bench_args: &BenchmarkArgs, rpc_url: String) -> eyre::Result<Self> {
3737
info!("Running benchmark using data from RPC URL: {}", rpc_url);
3838

39-
// Ensure that output directory is a directory
39+
// Ensure that output directory exists and is a directory
4040
if let Some(output) = &bench_args.output {
4141
if output.is_file() {
4242
return Err(eyre::eyre!("Output path must be a directory"));
4343
}
44+
// Create the directory if it doesn't exist
45+
if !output.exists() {
46+
std::fs::create_dir_all(output)?;
47+
info!("Created output directory: {:?}", output);
48+
}
4449
}
4550

4651
// set up alloy client for blocks

bin/reth/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ asm-keccak = [
7575
"reth-node-core/asm-keccak",
7676
"reth-primitives/asm-keccak",
7777
"reth-ethereum-cli/asm-keccak",
78+
"reth-node-ethereum/asm-keccak",
7879
]
7980

8081
jemalloc = [

crates/alloy-provider/README.md

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)