Refactor - Remove first_instruction_account
in bpf_loader
#30614
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
The logic in
process_instruction_common()
is quite complex and hard to understand. Additionally, we want to get rid ofprogram_indices
andtry_borrow_program_account
, so their usage in the BPF loader needs to be minimized.There are five cases of what
program_account
inputsprocess_instruction_common()
needs to handle:From that we can tell, that we only need to look at the last program in the chain, and only in case of the upgradeable loader also need the second last (the programdata account).
Summary of Changes
first_instruction_account
fromprocess_instruction_common()
,process_loader_upgradeable_instruction()
,process_loader_instruction()
andwrite_program_data()
.get_index_in_transaction()
andtry_borrow_account()
.