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

Cleanup loader features (#18977)

Browse Source
This commit is contained in:
Jack May
2021-07-29 15:03:00 -07:00
committed by GitHub
parent b05fb87f22
commit ef17cf3bdb
3 changed files with 42 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
programs/bpf_loader/src/lib.rs
View File

@@ -31,7 +31,7 @@ use solana_sdk::{
bpf_loader_upgradeable::{self, UpgradeableLoaderState},
clock::Clock,
entrypoint::{HEAP_LENGTH, SUCCESS},
feature_set::{add_missing_program_error_mappings, upgradeable_close_instruction},
feature_set::add_missing_program_error_mappings,
ic_logger_msg, ic_msg,
instruction::InstructionError,
keyed_account::{from_keyed_account, keyed_account_at_index},
@@ -620,9 +620,6 @@ fn process_loader_upgradeable_instruction(
ic_logger_msg!(logger, "New authority {:?}", new_authority);
}
UpgradeableLoaderInstruction::Close => {
if !invoke_context.is_feature_active(&upgradeable_close_instruction::id()) {
return Err(InstructionError::InvalidInstructionData);
}
let close_account = keyed_account_at_index(keyed_accounts, 0)?;
let recipient_account = keyed_account_at_index(keyed_accounts, 1)?;
let authority = keyed_account_at_index(keyed_accounts, 2)?;