Skip to content

fix: accurately track account and code weighs #19091

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

Merged
mattsse merged 3 commits into from
Oct 16, 2025
Merged

fix: accurately track account and code weighs #19091

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b12a7ec
fix: accurately track account and code weighs
mattsse Oct 16, 2025
8932bcf
use size_of_val
mattsse Oct 16, 2025
462de8e
use size_of_val
mattsse Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions crates/engine/tree/src/tree/cached_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,9 +474,9 @@ impl ExecutionCacheBuilder {
.build_with_hasher(DefaultHashBuilder::default());

let account_cache = CacheBuilder::new(self.account_cache_entries)
.weigher(|_key: &Address, _value: &Option<Account>| -> u32 {
.weigher(|_key: &Address, value: &Option<Account>| -> u32 {
// Account has a fixed size (none, balance,code_hash)
size_of::<Option<Account>>() as u32
20 + size_of_val(value) as u32
})
.max_capacity(account_cache_size)
.time_to_live(EXPIRY_TIME)
Expand All @@ -485,13 +485,19 @@ impl ExecutionCacheBuilder {

let code_cache = CacheBuilder::new(self.code_cache_entries)
.weigher(|_key: &B256, value: &Option<Bytecode>| -> u32 {
match value {
let code_size = match value {
Some(bytecode) => {
// base weight + actual bytecode size
(40 + bytecode.len()) as u32
// base weight + actual (padded) bytecode size + size of the jump table
(size_of_val(value) +
bytecode.bytecode().len() +
bytecode
.legacy_jump_table()
.map(|table| table.as_slice().len())
.unwrap_or_default()) as u32
}
None => 8, // size of None variant
}
None => size_of_val(value) as u32,
};
32 + code_size
})
.max_capacity(code_cache_size)
.time_to_live(EXPIRY_TIME)
Expand Down
Loading