blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Generalize matching criteria for tombstone at boot up (#31547) 

Generalize matching criteria for tombstone at bootup
This commit is contained in:
Pankaj Garg 2023-05-09 08:26:42 -07:00 committed by GitHub
parent 6a4a0418a6
commit 3845423e17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
program-runtime/src/loaded_programs.rs
View File

@ -318,7 +318,7 @@ impl LoadedProgramsForTxBatch {
pub enum LoadedProgramMatchCriteria { pub enum LoadedProgramMatchCriteria {
DeployedOnOrAfterSlot(Slot), DeployedOnOrAfterSlot(Slot),
Closed, Tombstone,
NoCriteria, NoCriteria,
} }
@ -410,9 +410,7 @@ impl LoadedPrograms {
LoadedProgramMatchCriteria::DeployedOnOrAfterSlot(slot) => { LoadedProgramMatchCriteria::DeployedOnOrAfterSlot(slot) => {
program.deployment_slot >= *slot program.deployment_slot >= *slot
} }
LoadedProgramMatchCriteria::Closed => { LoadedProgramMatchCriteria::Tombstone => program.is_tombstone(),
matches!(program.program, LoadedProgramType::Closed)
}
LoadedProgramMatchCriteria::NoCriteria => true, LoadedProgramMatchCriteria::NoCriteria => true,
} }
} }

2
runtime/src/bank.rs
View File

@ -4461,7 +4461,7 @@ impl Bank {
( (
*pubkey, *pubkey,
self.program_modification_slot(pubkey) self.program_modification_slot(pubkey)
.map_or(LoadedProgramMatchCriteria::Closed, |slot| { .map_or(LoadedProgramMatchCriteria::Tombstone, |slot| {
LoadedProgramMatchCriteria::DeployedOnOrAfterSlot(slot) LoadedProgramMatchCriteria::DeployedOnOrAfterSlot(slot)
}), }),
) )