Skip to content

fix(rpc): avoid duplicate precompile computation for last fork #20293

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

Closed
Bashmunta wants to merge 1 commit into from
Closed

fix(rpc): avoid duplicate precompile computation for last fork #20293

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions crates/rpc/rpc-eth-api/src/helpers/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ where

let mut config = EthConfig { current, next: None, last: None };

let last_fork_timestamp = fork_timestamps.last().copied().unwrap();

if let Some(next_fork_timestamp) = fork_timestamps.get(current_fork_idx + 1).copied() {
let fake_header = {
let mut header = latest.clone();
Expand All @@ -128,13 +130,19 @@ where
.map_err(RethError::other)?,
);

config.next = Some(self.build_fork_config_at(next_fork_timestamp, next_precompiles));
let next = self.build_fork_config_at(next_fork_timestamp, next_precompiles);
config.next = Some(next.clone());

// next and last refer to the same fork, share the configuration
if next_fork_timestamp == last_fork_timestamp {
config.last = Some(next);
return Ok(config);
}
} else {
// If there is no fork scheduled, there is no "last" or "final" fork scheduled.
return Ok(config);
}

let last_fork_timestamp = fork_timestamps.last().copied().unwrap();
let fake_header = {
let mut header = latest;
header.set_timestamp(last_fork_timestamp);
Expand Down
Loading