Cleanup superseded neon specific feature (#26142)
This commit is contained in:
parent
c4efb9f19e
commit
467c840df8
|
@ -16,8 +16,7 @@ use {
|
|||
account::{AccountSharedData, ReadableAccount},
|
||||
bpf_loader_upgradeable::{self, UpgradeableLoaderState},
|
||||
feature_set::{
|
||||
cap_accounts_data_len, neon_evm_compute_budget,
|
||||
record_instruction_in_transaction_context_push, requestable_heap_size,
|
||||
cap_accounts_data_len, record_instruction_in_transaction_context_push,
|
||||
tx_wide_compute_cap, FeatureSet,
|
||||
},
|
||||
hash::Hash,
|
||||
|
@ -344,22 +343,7 @@ impl<'a> InvokeContext<'a> {
|
|||
.get_instruction_context_stack_height()
|
||||
== 0
|
||||
{
|
||||
let mut compute_budget = self.compute_budget;
|
||||
if !self.feature_set.is_active(&tx_wide_compute_cap::id())
|
||||
&& self.feature_set.is_active(&neon_evm_compute_budget::id())
|
||||
&& program_id == &crate::neon_evm_program::id()
|
||||
{
|
||||
// Bump the compute budget for neon_evm
|
||||
compute_budget.compute_unit_limit = compute_budget.compute_unit_limit.max(500_000);
|
||||
}
|
||||
if !self.feature_set.is_active(&requestable_heap_size::id())
|
||||
&& self.feature_set.is_active(&neon_evm_compute_budget::id())
|
||||
&& program_id == &crate::neon_evm_program::id()
|
||||
{
|
||||
// Bump the compute budget for neon_evm
|
||||
compute_budget.heap_size = Some(256_usize.saturating_mul(1024));
|
||||
}
|
||||
self.current_compute_budget = compute_budget;
|
||||
self.current_compute_budget = self.compute_budget;
|
||||
|
||||
if !self.feature_set.is_active(&tx_wide_compute_cap::id()) {
|
||||
self.compute_meter =
|
||||
|
@ -1668,17 +1652,10 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn test_invoke_context_compute_budget() {
|
||||
let accounts = vec![
|
||||
(solana_sdk::pubkey::new_rand(), AccountSharedData::default()),
|
||||
(crate::neon_evm_program::id(), AccountSharedData::default()),
|
||||
];
|
||||
let accounts = vec![(solana_sdk::pubkey::new_rand(), AccountSharedData::default())];
|
||||
|
||||
let mut feature_set = FeatureSet::all_enabled();
|
||||
feature_set.deactivate(&tx_wide_compute_cap::id());
|
||||
feature_set.deactivate(&requestable_heap_size::id());
|
||||
let mut transaction_context = TransactionContext::new(accounts, 1, 3);
|
||||
let mut invoke_context = InvokeContext::new_mock(&mut transaction_context, &[]);
|
||||
invoke_context.feature_set = Arc::new(feature_set);
|
||||
invoke_context.compute_budget =
|
||||
ComputeBudget::new(compute_budget::DEFAULT_INSTRUCTION_COMPUTE_UNIT_LIMIT as u64);
|
||||
|
||||
|
@ -1688,25 +1665,6 @@ mod tests {
|
|||
ComputeBudget::new(compute_budget::DEFAULT_INSTRUCTION_COMPUTE_UNIT_LIMIT as u64)
|
||||
);
|
||||
invoke_context.pop().unwrap();
|
||||
|
||||
invoke_context.push(&[], &[1], &[]).unwrap();
|
||||
let expected_compute_budget = ComputeBudget {
|
||||
compute_unit_limit: 500_000,
|
||||
heap_size: Some(256_usize.saturating_mul(1024)),
|
||||
..ComputeBudget::new(compute_budget::DEFAULT_INSTRUCTION_COMPUTE_UNIT_LIMIT as u64)
|
||||
};
|
||||
assert_eq!(
|
||||
*invoke_context.get_compute_budget(),
|
||||
expected_compute_budget
|
||||
);
|
||||
invoke_context.pop().unwrap();
|
||||
|
||||
invoke_context.push(&[], &[0], &[]).unwrap();
|
||||
assert_eq!(
|
||||
*invoke_context.get_compute_budget(),
|
||||
ComputeBudget::new(compute_budget::DEFAULT_INSTRUCTION_COMPUTE_UNIT_LIMIT as u64)
|
||||
);
|
||||
invoke_context.pop().unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
|
@ -6,7 +6,6 @@ pub mod accounts_data_meter;
|
|||
pub mod compute_budget;
|
||||
pub mod invoke_context;
|
||||
pub mod log_collector;
|
||||
pub mod neon_evm_program;
|
||||
pub mod pre_account;
|
||||
pub mod prioritization_fee;
|
||||
pub mod stable_log;
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
solana_sdk::declare_id!("eeLSJgWzzxrqKv1UxtRVVH8FX3qCQWUs9QuAjJpETGU");
|
||||
|
||||
#[cfg(test)]
|
||||
pub mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn test_id() {
|
||||
id().log();
|
||||
}
|
||||
}
|
|
@ -109,10 +109,6 @@ pub mod vote_stake_checked_instructions {
|
|||
solana_sdk::declare_id!("BcWknVcgvonN8sL4HE4XFuEVgfcee5MwxWPAgP6ZV89X");
|
||||
}
|
||||
|
||||
pub mod neon_evm_compute_budget {
|
||||
solana_sdk::declare_id!("GLrVvDPkQi5PMYUrsYWT9doZhSHr1BVZXqj5DbFps3rS");
|
||||
}
|
||||
|
||||
pub mod rent_for_sysvars {
|
||||
solana_sdk::declare_id!("BKCPBQQBZqggVnFso5nQ8rQ4RwwogYwjuUt9biBjxwNF");
|
||||
}
|
||||
|
@ -466,7 +462,6 @@ lazy_static! {
|
|||
(dedupe_config_program_signers::id(), "dedupe config program signers"),
|
||||
(verify_tx_signatures_len::id(), "prohibit extra transaction signatures"),
|
||||
(vote_stake_checked_instructions::id(), "vote/state program checked instructions #18345"),
|
||||
(neon_evm_compute_budget::id(), "bump neon_evm's compute budget"),
|
||||
(rent_for_sysvars::id(), "collect rent from accounts owned by sysvars"),
|
||||
(libsecp256k1_0_5_upgrade_enabled::id(), "upgrade libsecp256k1 to v0.5.0"),
|
||||
(tx_wide_compute_cap::id(), "transaction wide compute cap"),
|
||||
|
|
Loading…
Reference in New Issue