Skip to content

chore(l1): path based cleanup #4837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 45 commits into from
Oct 14, 2025
Merged

chore(l1): path based cleanup #4837

merged 45 commits into from
Oct 14, 2025

Conversation

MegaRedHand
Copy link
Collaborator

@MegaRedHand MegaRedHand commented Oct 9, 2025 •
edited
Loading

Based on path_based branch.

@MegaRedHand
fix: use direct DB access in reset_to_head
a61c22c
@MegaRedHand
chore: remove panic
57cb17d
@MegaRedHand
chore: remove snapshot code
0d21862
@MegaRedHand
chore: update comment
46c10bf
@MegaRedHand
chore: remove more snapshot logic
776a624
@MegaRedHand
chore: remove unused async
0e192f8
@MegaRedHand
chore: remove more snapshot logic
9ba3caf
@MegaRedHand
refctor: minimize async closure
a0ecf58
@MegaRedHand
chore: remove unneeded async
3ed4459
@MegaRedHand
chore: remove unneeded async and clones
15f66fc
@MegaRedHand
chore: fix clippy lints
2c1aa3f
@MegaRedHand
docs: document reset_to_head
5dad3ba
@MegaRedHand
fix: update latest header in remove_block
c98b601
@MegaRedHand
fix: update chain metadata when removing block
7865a5c
@MegaRedHand
fix: move spawn inside start_test_api
0752566
@MegaRedHand
fix: set correct trie root in InMemoryDB
37aafc7
@MegaRedHand
fix: use direct DB access for genesis setup
cacca6a
@MegaRedHand
chore: avoid holding mutex through await
0fa6b7a
@MegaRedHand
chore: add scope so mutex is dropped
4ea310d
@MegaRedHand
Revert "fix: update chain metadata when removing block"
4ba24aa 
This reverts commit 7865a5c.
@MegaRedHand
Revert "fix: update latest header in remove_block"
2729ddd 
This reverts commit c98b601.
@MegaRedHand
Merge branch 'path_based' into path_based_cleanup
b6d9ab9
@github-actions GitHub Actions
Copy link

github-actions bot commented Oct 9, 2025 •
edited
Loading

Lines of code report

Total lines added: 21
Total lines removed: 42
Total lines changed: 63

Detailed view 
+------------------------------------------------------+-------+------+
| File                                                 | Lines | Diff |
+------------------------------------------------------+-------+------+
| ethrex/cmd/ethrex/l2/command.rs                      | 635   | -14  |
+------------------------------------------------------+-------+------+
| ethrex/crates/blockchain/blockchain.rs               | 883   | -1   |
+------------------------------------------------------+-------+------+
| ethrex/crates/common/trie/node.rs                    | 246   | -5   |
+------------------------------------------------------+-------+------+
| ethrex/crates/common/trie/node/branch.rs             | 529   | -1   |
+------------------------------------------------------+-------+------+
| ethrex/crates/common/trie/trie.rs                    | 911   | -3   |
+------------------------------------------------------+-------+------+
| ethrex/crates/networking/p2p/sync/state_healing.rs   | 381   | -8   |
+------------------------------------------------------+-------+------+
| ethrex/crates/networking/p2p/sync/storage_healing.rs | 568   | -10  |
+------------------------------------------------------+-------+------+
| ethrex/crates/networking/rpc/utils.rs                | 380   | +2   |
+------------------------------------------------------+-------+------+
| ethrex/crates/storage/store.rs                       | 1484  | +1   |
+------------------------------------------------------+-------+------+
| ethrex/crates/storage/store_db/in_memory.rs          | 597   | +1   |
+------------------------------------------------------+-------+------+
| ethrex/crates/storage/store_db/rocksdb.rs            | 1207  | +1   |
+------------------------------------------------------+-------+------+
| ethrex/crates/storage/trie_db/layering.rs            | 134   | +13  |
+------------------------------------------------------+-------+------+
| ethrex/tooling/ef_tests/blockchain/test_runner.rs    | 353   | +3   |
+------------------------------------------------------+-------+------+

@github-actions GitHub Actions
Copy link

github-actions bot commented Oct 9, 2025

Benchmark for f8f80cc

Click to view benchmark
Test Base PR %
Trie/cita-trie insert 10k 34.9±0.30ms 34.7±0.13ms -0.57%
Trie/cita-trie insert 1k 3.6±0.02ms 3.5±0.10ms -2.78%
Trie/ethrex-trie insert 10k 54.8±0.69ms 61.9±0.84ms +12.96%
Trie/ethrex-trie insert 1k 6.1±0.03ms 7.9±0.12ms +29.51%

@jrchatruc jrchatruc changed the base branch from main to path_based October 10, 2025 15:41
@github-actions GitHub Actions
Copy link

Benchmark for df49426

Click to view benchmark
Test Base PR %
Trie/cita-trie insert 10k 34.7±0.32ms 35.8±0.56ms +3.17%
Trie/cita-trie insert 1k 3.5±0.01ms 3.7±0.25ms +5.71%
Trie/ethrex-trie insert 10k 66.2±0.67ms 61.7±0.48ms -6.80%
Trie/ethrex-trie insert 1k 8.3±0.04ms 8.0±0.03ms -3.61%

@github-actions GitHub Actions
Copy link

Benchmark for 0c1e473

Click to view benchmark
Test Base PR %
Trie/cita-trie insert 10k 36.6±1.24ms 36.8±1.38ms +0.55%
Trie/cita-trie insert 1k 3.5±0.02ms 3.6±0.13ms +2.86%
Trie/ethrex-trie insert 10k 68.5±1.23ms 63.8±1.93ms -6.86%
Trie/ethrex-trie insert 1k 8.3±0.02ms 8.1±0.05ms -2.41%

@github-actions GitHub Actions
Copy link

Benchmark for 5c8ede3

Click to view benchmark
Test Base PR %
Trie/cita-trie insert 10k 38.7±1.74ms 38.1±1.34ms -1.55%
Trie/cita-trie insert 1k 3.6±0.01ms 3.6±0.17ms 0.00%
Trie/ethrex-trie insert 10k 70.3±1.78ms 66.3±2.21ms -5.69%
Trie/ethrex-trie insert 1k 8.4±0.04ms 8.0±0.03ms -4.76%

@github-actions GitHub Actions
Copy link

Benchmark for 60de075

Click to view benchmark
Test Base PR %
Trie/cita-trie insert 10k 34.3±0.67ms 34.7±0.43ms +1.17%
Trie/cita-trie insert 1k 3.5±0.02ms 3.6±0.01ms +2.86%
Trie/ethrex-trie insert 10k 66.5±0.30ms 61.5±0.71ms -7.52%
Trie/ethrex-trie insert 1k 8.4±0.13ms 8.3±0.32ms -1.19%

@github-actions GitHub Actions
Copy link

Benchmark for 1803718

Click to view benchmark
Test Base PR %
Trie/cita-trie insert 10k 37.6±1.90ms 35.1±0.70ms -6.65%
Trie/cita-trie insert 1k 3.6±0.03ms 3.5±0.01ms -2.78%
Trie/ethrex-trie insert 10k 67.6±1.48ms 61.9±0.67ms -8.43%
Trie/ethrex-trie insert 1k 8.4±0.20ms 8.0±0.20ms -4.76%

@github-actions GitHub Actions
Copy link

Benchmark for bdc6919

Click to view benchmark
Test Base PR %
Trie/cita-trie insert 10k 34.7±0.53ms 34.5±0.21ms -0.58%
Trie/cita-trie insert 1k 3.5±0.01ms 3.5±0.18ms 0.00%
Trie/ethrex-trie insert 10k 66.0±0.82ms 61.5±0.46ms -6.82%
Trie/ethrex-trie insert 1k 8.4±0.11ms 8.0±0.03ms -4.76%

@github-actions GitHub Actions
Copy link

Benchmark for dd3229c

Click to view benchmark
Test Base PR %
Trie/cita-trie insert 10k 37.9±3.30ms 35.2±1.45ms -7.12%
Trie/cita-trie insert 1k 3.5±0.02ms 3.5±0.01ms 0.00%
Trie/ethrex-trie insert 10k 67.4±1.17ms 61.6±0.64ms -8.61%
Trie/ethrex-trie insert 1k 8.4±0.19ms 8.0±0.23ms -4.76%

@ilitteri
fix(l2): state reconstruct test (#4858)
6707eb5 
> [!NOTE]
> This PR points to `main` to trigger the workflow `pr-main_l2` that
runs the state diff test.

**Motivation**

<!-- Why does this pull request exist? What are its goals? -->

**Description**

<!-- A clear and concise general description of the changes this PR
introduces -->

<!-- Link to issues: Resolves #111, Resolves #222 -->

Closes #issue_number
@github-actions GitHub Actions
Copy link

Benchmark for 36430f2

Click to view benchmark
Test Base PR %
Trie/cita-trie insert 10k 36.9±2.06ms 39.6±2.89ms +7.32%
Trie/cita-trie insert 1k 3.5±0.05ms 3.6±0.22ms +2.86%
Trie/ethrex-trie insert 10k 66.3±1.10ms 64.3±4.18ms -3.02%
Trie/ethrex-trie insert 1k 8.3±0.10ms 8.0±0.20ms -3.61%

@ilitteri ilitteri changed the title Path based cleanup chore(l1): path based cleanup Oct 14, 2025
@ilitteri ilitteri marked this pull request as ready for review October 14, 2025 21:01
@ilitteri ilitteri requested a review from a team as a code owner October 14, 2025 21:01
@github-actions github-actions bot added the L1 Ethereum client label Oct 14, 2025
@github-actions GitHub Actions
Copy link

Benchmark for ff1a66b

Click to view benchmark
Test Base PR %
Trie/cita-trie insert 10k 39.0±3.19ms 39.8±2.93ms +2.05%
Trie/cita-trie insert 1k 3.5±0.01ms 3.6±0.17ms +2.86%
Trie/ethrex-trie insert 10k 69.1±1.49ms 65.9±2.08ms -4.63%
Trie/ethrex-trie insert 1k 8.4±0.07ms 8.1±0.07ms -3.57%

@github-project-automation github-project-automation bot moved this to In Review in ethrex_l1 Oct 14, 2025
@jrchatruc jrchatruc merged commit 7b19135 into path_based Oct 14, 2025
48 of 49 checks passed
@jrchatruc jrchatruc deleted the path_based_cleanup branch October 14, 2025 22:20
@github-project-automation github-project-automation bot moved this from In Review to Done in ethrex_l1 Oct 14, 2025
@Oppen Oppen mentioned this pull request Oct 14, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jrchatruc jrchatruc jrchatruc approved these changes

Assignees

@MegaRedHand MegaRedHand

Labels

L1 Ethereum client

Projects

ethrex_l1
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@MegaRedHand @jrchatruc @ilitteri