Skip to content
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

Programs deployed before the latest root available on all current forks #31530

Merged
merged 2 commits into from
May 8, 2023
Merged

Programs deployed before the latest root available on all current forks #31530

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17267cb
Programs deployed before the latest root available on all current forks
pgarg66 May 8, 2023
93daa97
remove special case of slot 0
pgarg66 May 8, 2023
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
27 changes: 16 additions & 11 deletions program-runtime/src/loaded_programs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,8 @@ pub struct LoadedPrograms {
///
/// Pubkey is the address of a program, multiple versions can coexists simultaneously under the same address (in different slots).
entries: HashMap<Pubkey, Vec<Arc<LoadedProgram>>>,

latest_root: Slot,
}

#[derive(Debug, Default)]
Expand Down Expand Up @@ -378,6 +380,8 @@ impl LoadedPrograms {

self.remove_expired_entries(new_root);
self.remove_programs_with_no_entries();

self.latest_root = std::cmp::max(self.latest_root, new_root);
}

fn matches_loaded_program(
Expand Down Expand Up @@ -408,7 +412,8 @@ impl LoadedPrograms {
if let Some(second_level) = self.entries.get(&key) {
for entry in second_level.iter().rev() {
let current_slot = working_slot.current_slot();
if current_slot == entry.deployment_slot
if entry.deployment_slot <= self.latest_root
|| entry.deployment_slot == current_slot
|| working_slot.is_ancestor(entry.deployment_slot)
{
if entry
Expand Down Expand Up @@ -1339,8 +1344,8 @@ mod tests {
// |
// 23

// Testing fork 0 - 10 - 12 - 22 (which was pruned) with current slot at 22
let working_slot = TestWorkingSlot::new(22, &[0, 10, 20, 22]);
// Testing fork 11 - 15 - 16- 19 - 22 with root at 5 and current slot at 22
let working_slot = TestWorkingSlot::new(22, &[5, 11, 15, 16, 19, 22, 23]);
let (found, missing) = cache.extract(
&working_slot,
vec![
Expand All @@ -1354,13 +1359,13 @@ mod tests {

// Since the fork was pruned, we should not find the entry deployed at slot 20.
assert!(match_slot(&found, &program1, 0, 22));
assert!(match_slot(&found, &program4, 0, 22));
assert!(match_slot(&found, &program2, 11, 22));
assert!(match_slot(&found, &program4, 15, 22));

assert!(missing.contains(&program2));
assert!(missing.contains(&program3));

// Testing fork 0 - 5 - 11 - 25 - 27 with current slot at 27
let working_slot = TestWorkingSlot::new(27, &[0, 5, 11, 25, 27]);
let working_slot = TestWorkingSlot::new(27, &[11, 25, 27]);
let (found, _missing) = cache.extract(
&working_slot,
vec![
Expand Down Expand Up @@ -1394,8 +1399,8 @@ mod tests {
// |
// 23

// Testing fork 0 - 5 - 11 - 25 - 27 (with root at 15, slot 25, 27 are pruned) with current slot at 27
let working_slot = TestWorkingSlot::new(27, &[0, 5, 11, 25, 27]);
// Testing fork 16, 19, 23, with root at 15, current slot at 23
let working_slot = TestWorkingSlot::new(23, &[16, 19, 23]);
let (found, missing) = cache.extract(
&working_slot,
vec![
Expand All @@ -1407,9 +1412,9 @@ mod tests {
.into_iter(),
);

assert!(match_slot(&found, &program1, 0, 27));
assert!(match_slot(&found, &program2, 11, 27));
assert!(match_slot(&found, &program4, 5, 27));
assert!(match_slot(&found, &program1, 0, 23));
assert!(match_slot(&found, &program2, 11, 23));
assert!(match_slot(&found, &program4, 15, 23));

// program3 was deployed on slot 25, which has been pruned
assert!(missing.contains(&program3));
Expand Down