feat: add StaticFileSegment::StorageChangeSets by Rjected · Pull Request #20896 · paradigmxyz/reth

Rjected · 2026-01-09T18:51:20Z

Adds storage changeset static files, which re-use the changeset offsets introduced in #18882

The entries are sorted by address and key rather than just address.

Adds support with the --static-files.storage-change-sets flag

Closes RETH-174

gakonst

Suggestion

Consider adding an equivalence test: same query set against MDBX-only vs static-file providers should produce identical results for:

storage_changesets_range(from..=to)
get_storage_before_block(block, addr, key)

joshieDo · 2026-01-20T11:08:52Z

crates/storage/provider/src/providers/static_file/manager.rs

+    fn storage_changeset_count(&self) -> ProviderResult<usize> {
+        let mut count = 0;
+
+        let static_files = iter_static_files(&self.path).map_err(ProviderError::other)?;


there should be a better way rather than read from disk again

joshieDo · 2026-01-20T11:21:53Z

crates/storage/provider/src/providers/database/provider.rs

            tracing::trace!(block_number, "Writing block change");
            // sort changes by address.
            storage_changes.par_sort_unstable_by_key(|a| a.address);
+            let mut changeset = Vec::new();


could we call with_capacity here

yep now uses with_capacity

joshieDo

would like to review again once conflicts are in - but it seems to me that we might have some perf impact, because instead of just iterating over the _range, we're collecting it

unsure if there is a better way to handle it tho, or if it's even a significant impact

joshieDo · 2026-01-21T16:52:34Z

crates/storage/provider/src/providers/database/provider.rs

+        if self.cached_storage_settings().storage_changesets_in_static_files {
+            self.static_file_provider.storage_changesets_range(range)


i think it makes sense,

but we do it differently on account_changesets_range :

reth/crates/storage/provider/src/providers/database/provider.rs

Lines 1368 to 1398 in d22056d

fn account_changesets_range(

&self,

range: impl core::ops::RangeBounds<BlockNumber>,

) -> ProviderResult<Vec<(BlockNumber, AccountBeforeTx)>> {

let range = to_range(range);

let mut changesets = Vec::new();

if self.cached_storage_settings().account_changesets_in_static_files &&

let Some(highest) = self

.static_file_provider

.get_highest_static_file_block(StaticFileSegment::AccountChangeSets)

{

let static_end = range.end.min(highest + 1);

if range.start < static_end {

for block in range.start..static_end {

let block_changesets = self.account_block_changeset(block)?;

for changeset in block_changesets {

changesets.push((block, changeset));

}

}

}

} else {

// Fetch from database for blocks not in static files

let mut cursor = self.tx.cursor_read::<tables::AccountChangeSets>()?;

for entry in cursor.walk_range(range)? {

let (block_num, account_before) = entry?;

changesets.push((block_num, account_before));

}

}

Ok(changesets)

}

unsure

I prefer this way of doing it, I think we should rely on storage settings as the source of truth for where we should be checking, and not have the other checks for highest static files

codspeed-hq · 2026-01-21T21:20:00Z

CodSpeed Performance Report

Merging this PR will not alter performance

_{Comparing dan/storage-changesets-static-files (113540b) with main (055bf63)}

Summary

✅ 118 untouched benchmarks
⏩ 7 skipped benchmarks¹

7 benchmarks were skipped, so the baseline results were used instead. If they were deleted from the codebase, click here and archive them to remove them from the performance reports. ↩

…ic files The storage changeset static file feature (PR #20896) added routing but forgot to add write_storage_changesets to StateWriteConfig. This caused storage changesets to be written twice when static files were enabled: once via write_blocks_data and again via write_state_reverts. - Add write_storage_changesets field to StateWriteConfig - Pass sf_ctx.write_storage_changesets to the config in save_blocks - Guard storage changeset writes in write_state_reverts with the config - Remove stale workaround comments from RocksDB tests Amp-Thread-ID: https://ampcode.com/threads/T-019bfe6a-bf5e-7207-851a-b05585d255b6

github-project-automation bot added this to Reth Tracker Jan 9, 2026

github-project-automation bot moved this to Backlog in Reth Tracker Jan 9, 2026

Rjected force-pushed the dan/storage-changesets-static-files branch from 3154581 to 010ded8 Compare January 9, 2026 19:03

mattsse force-pushed the main branch from 3cad676 to 0f3d369 Compare January 10, 2026 15:16

Rjected marked this pull request as ready for review January 19, 2026 16:29

Rjected requested review from fgimenez, gakonst, joshieDo, klkvr, mattsse, mediocregopher, rakita, shekhirin and yongkangc as code owners January 19, 2026 16:29

gakonst reviewed Jan 20, 2026

View reviewed changes

joshieDo reviewed Jan 20, 2026

View reviewed changes

joshieDo approved these changes Jan 20, 2026

View reviewed changes

github-project-automation bot moved this from Backlog to In Progress in Reth Tracker Jan 20, 2026

Rjected force-pushed the dan/storage-changesets-static-files branch 4 times, most recently from dfa7e37 to d22056d Compare January 20, 2026 21:22

joshieDo reviewed Jan 21, 2026

View reviewed changes

Rjected added 2 commits January 21, 2026 15:09

feat: add StaticFileSegment::StorageChangeSets

ac4c7e6

fix: add write_storage_changesets to StaticFileWriteCtx

146006b

Rjected force-pushed the dan/storage-changesets-static-files branch from d8b739c to 146006b Compare January 21, 2026 20:09

fix: add default static file flag for storage changesets

bad1a89

fix: finalize storage changesets

113540b

joshieDo approved these changes Jan 22, 2026

View reviewed changes

yongkangc approved these changes Jan 22, 2026

View reviewed changes

Rjected added this pull request to the merge queue Jan 22, 2026

Merged via the queue into main with commit ebe2ca1 Jan 22, 2026
45 checks passed

Rjected deleted the dan/storage-changesets-static-files branch January 22, 2026 15:14

github-project-automation bot moved this from In Progress to Done in Reth Tracker Jan 22, 2026

This was referenced Jan 22, 2026

StorageChangeSets static files segment #18983

Closed

chore: simplify account_changesets_range #21457

Merged

yongkangc mentioned this pull request Jan 27, 2026

fix(provider): skip storage changeset writes when routed to static files #21468

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add StaticFileSegment::StorageChangeSets#20896

feat: add StaticFileSegment::StorageChangeSets#20896
Rjected merged 4 commits intomainfrom
dan/storage-changesets-static-files

Rjected commented Jan 9, 2026 •

edited by emmajam

Loading

Uh oh!

gakonst left a comment •

edited by joshieDo

Loading

Uh oh!

joshieDo Jan 20, 2026

Uh oh!

joshieDo Jan 20, 2026

Uh oh!

Rjected Jan 20, 2026

Uh oh!

joshieDo left a comment •

edited

Loading

Uh oh!

joshieDo Jan 21, 2026

Uh oh!

Rjected Jan 21, 2026

Uh oh!

joshieDo Jan 21, 2026

Uh oh!

codspeed-hq bot commented Jan 21, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

		if self.cached_storage_settings().storage_changesets_in_static_files {
		self.static_file_provider.storage_changesets_range(range)

	fn account_changesets_range(
	&self,
	range: impl core::ops::RangeBounds<BlockNumber>,
	) -> ProviderResult<Vec<(BlockNumber, AccountBeforeTx)>> {
	let range = to_range(range);
	let mut changesets = Vec::new();
	if self.cached_storage_settings().account_changesets_in_static_files &&
	let Some(highest) = self
	.static_file_provider
	.get_highest_static_file_block(StaticFileSegment::AccountChangeSets)
	{
	let static_end = range.end.min(highest + 1);
	if range.start < static_end {
	for block in range.start..static_end {
	let block_changesets = self.account_block_changeset(block)?;
	for changeset in block_changesets {
	changesets.push((block, changeset));
	}
	}
	}
	} else {
	// Fetch from database for blocks not in static files
	let mut cursor = self.tx.cursor_read::<tables::AccountChangeSets>()?;
	for entry in cursor.walk_range(range)? {
	let (block_num, account_before) = entry?;
	changesets.push((block_num, account_before));
	}
	}

	Ok(changesets)
	}

Conversation

Rjected commented Jan 9, 2026 • edited by emmajam Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gakonst left a comment • edited by joshieDo Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Suggestion

Uh oh!

joshieDo Jan 20, 2026

Choose a reason for hiding this comment

Uh oh!

joshieDo Jan 20, 2026

Choose a reason for hiding this comment

Uh oh!

Rjected Jan 20, 2026

Choose a reason for hiding this comment

Uh oh!

joshieDo left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

joshieDo Jan 21, 2026

Choose a reason for hiding this comment

Uh oh!

Rjected Jan 21, 2026

Choose a reason for hiding this comment

Uh oh!

joshieDo Jan 21, 2026

Choose a reason for hiding this comment

Uh oh!

codspeed-hq bot commented Jan 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

CodSpeed Performance Report

Merging this PR will not alter performance

Summary

Footnotes

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Rjected commented Jan 9, 2026 •

edited by emmajam

Loading

gakonst left a comment •

edited by joshieDo

Loading

joshieDo left a comment •

edited

Loading

codspeed-hq bot commented Jan 21, 2026 •

edited

Loading