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

Refactor: Replaces KeyedAccount in_get_sysvar_with_account_check (#23905)

Browse Source 
* Replaces all use sites of get_sysvar_with_account_check by get_sysvar_with_account_check2.

* Removes get_sysvar_with_account_check.

* Renames get_sysvar_with_account_check2 to get_sysvar_with_account_check.
This commit is contained in:
Alexander Meißner
2022-03-24 19:30:42 +01:00
committed by GitHub
parent 37c36ce3fa
commit 140c8dd01f
5 changed files with 50 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -492,20 +492,9 @@ fn process_loader_upgradeable_instruction(
keyed_accounts,
first_instruction_account.saturating_add(3),
)?;
let rent = get_sysvar_with_account_check::rent(
keyed_account_at_index(
keyed_accounts,
first_instruction_account.saturating_add(4),
)?,
invoke_context,
)?;
let clock = get_sysvar_with_account_check::clock(
keyed_account_at_index(
keyed_accounts,
first_instruction_account.saturating_add(5),
)?,
invoke_context,
)?;
let rent = get_sysvar_with_account_check::rent(invoke_context, instruction_context, 4)?;
let clock =
get_sysvar_with_account_check::clock(invoke_context, instruction_context, 5)?;
let authority = keyed_account_at_index(
keyed_accounts,
first_instruction_account.saturating_add(7),
@@ -683,20 +672,9 @@ fn process_loader_upgradeable_instruction(
keyed_accounts,
first_instruction_account.saturating_add(2),
)?;
let rent = get_sysvar_with_account_check::rent(
keyed_account_at_index(
keyed_accounts,
first_instruction_account.saturating_add(4),
)?,
invoke_context,
)?;
let clock = get_sysvar_with_account_check::clock(
keyed_account_at_index(
keyed_accounts,
first_instruction_account.saturating_add(5),
)?,
invoke_context,
)?;
let rent = get_sysvar_with_account_check::rent(invoke_context, instruction_context, 4)?;
let clock =
get_sysvar_with_account_check::clock(invoke_context, instruction_context, 5)?;
let authority = keyed_account_at_index(
keyed_accounts,
first_instruction_account.saturating_add(6),