move PROGRAM_OWNERS to sdk (#34193)
* move PROGRAM_OWNERS to sdk * Update sdk/src/account.rs Co-authored-by: Alexander Meißner <AlexanderMeissner@gmx.net> --------- Co-authored-by: HaoranYi <haoran.yi@solana.com> Co-authored-by: Alexander Meißner <AlexanderMeissner@gmx.net>
This commit is contained in:
parent
481c357543
commit
57dc7adda1
|
@ -125,9 +125,9 @@ use {
|
||||||
account::{
|
account::{
|
||||||
create_account_shared_data_with_fields as create_account, from_account, Account,
|
create_account_shared_data_with_fields as create_account, from_account, Account,
|
||||||
AccountSharedData, InheritableAccountFields, ReadableAccount, WritableAccount,
|
AccountSharedData, InheritableAccountFields, ReadableAccount, WritableAccount,
|
||||||
|
PROGRAM_OWNERS,
|
||||||
},
|
},
|
||||||
account_utils::StateMut,
|
account_utils::StateMut,
|
||||||
bpf_loader, bpf_loader_deprecated,
|
|
||||||
bpf_loader_upgradeable::{self, UpgradeableLoaderState},
|
bpf_loader_upgradeable::{self, UpgradeableLoaderState},
|
||||||
clock::{
|
clock::{
|
||||||
BankId, Epoch, Slot, SlotCount, SlotIndex, UnixTimestamp, DEFAULT_HASHES_PER_TICK,
|
BankId, Epoch, Slot, SlotCount, SlotIndex, UnixTimestamp, DEFAULT_HASHES_PER_TICK,
|
||||||
|
@ -5229,12 +5229,6 @@ impl Bank {
|
||||||
);
|
);
|
||||||
check_time.stop();
|
check_time.stop();
|
||||||
|
|
||||||
const PROGRAM_OWNERS: &[Pubkey] = &[
|
|
||||||
bpf_loader_upgradeable::id(),
|
|
||||||
bpf_loader::id(),
|
|
||||||
bpf_loader_deprecated::id(),
|
|
||||||
loader_v4::id(),
|
|
||||||
];
|
|
||||||
let mut program_accounts_map = self.filter_executable_program_accounts(
|
let mut program_accounts_map = self.filter_executable_program_accounts(
|
||||||
&self.ancestors,
|
&self.ancestors,
|
||||||
sanitized_txs,
|
sanitized_txs,
|
||||||
|
|
|
@ -4,8 +4,10 @@
|
||||||
use qualifier_attr::qualifiers;
|
use qualifier_attr::qualifiers;
|
||||||
use {
|
use {
|
||||||
crate::{
|
crate::{
|
||||||
|
bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable,
|
||||||
clock::{Epoch, INITIAL_RENT_EPOCH},
|
clock::{Epoch, INITIAL_RENT_EPOCH},
|
||||||
lamports::LamportsError,
|
lamports::LamportsError,
|
||||||
|
loader_v4,
|
||||||
pubkey::Pubkey,
|
pubkey::Pubkey,
|
||||||
},
|
},
|
||||||
serde::{
|
serde::{
|
||||||
|
@ -753,6 +755,13 @@ pub fn create_is_signer_account_infos<'a>(
|
||||||
})
|
})
|
||||||
.collect()
|
.collect()
|
||||||
}
|
}
|
||||||
|
+ /// Replacement for the executable flag: An account being owned by one of these contains a program.
|
||||||
|
pub const PROGRAM_OWNERS: &[Pubkey] = &[
|
||||||
|
bpf_loader_upgradeable::id(),
|
||||||
|
bpf_loader::id(),
|
||||||
|
bpf_loader_deprecated::id(),
|
||||||
|
loader_v4::id(),
|
||||||
|
];
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
pub mod tests {
|
pub mod tests {
|
||||||
|
|
Loading…
Reference in New Issue