gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Feature cleanup (#19528)

Browse Source
This commit is contained in:
Jack May
2021-08-31 14:51:26 -07:00
committed by GitHub
parent e1939688c2
commit 5cf8d8795b
7 changed files with 32 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/src/accounts.rs
View File

@@ -247,9 +247,7 @@ impl Accounts {
payer_index = Some(i);
}
if solana_sdk::sysvar::instructions::check_id(key)
&& feature_set.is_active(&feature_set::instructions_sysvar_enabled::id())
{
if solana_sdk::sysvar::instructions::check_id(key) {
if message.is_writable(i) {
return Err(TransactionError::InvalidAccountIndex);
}

21
runtime/src/message_processor.rs
View File

@@ -10,8 +10,7 @@ use solana_sdk::{
account::{AccountSharedData, ReadableAccount, WritableAccount},
compute_budget::ComputeBudget,
feature_set::{
instructions_sysvar_enabled, neon_evm_compute_budget, tx_wide_compute_cap,
updated_verify_policy, FeatureSet,
neon_evm_compute_budget, tx_wide_compute_cap, updated_verify_policy, FeatureSet,
},
fee_calculator::FeeCalculator,
hash::Hash,
@@ -477,16 +476,14 @@ impl MessageProcessor {
) -> Result<(), InstructionError> {
// Fixup the special instructions key if present
// before the account pre-values are taken care of
if feature_set.is_active(&instructions_sysvar_enabled::id()) {
for (pubkey, accont) in accounts.iter().take(message.account_keys.len()) {
if instructions::check_id(pubkey) {
let mut mut_account_ref = accont.borrow_mut();
instructions::store_current_index(
mut_account_ref.data_as_mut_slice(),
instruction_index as u16,
);
break;
}
for (pubkey, accont) in accounts.iter().take(message.account_keys.len()) {
if instructions::check_id(pubkey) {
let mut mut_account_ref = accont.borrow_mut();
instructions::store_current_index(
mut_account_ref.data_as_mut_slice(),
instruction_index as u16,
);
break;
}
}