Skip to content

Commit

Permalink
CPI support for bpf_loader_deprecated (bp #11695) (#11824)
Browse files Browse the repository at this point in the history
* CPI support for bpf_loader_deprecated (#11695)

(cherry picked from commit 4683012)

# Conflicts:
#	programs/bpf_loader/src/syscalls.rs

* resolve conflicts

Co-authored-by: Jack May <[email protected]>
  • Loading branch information
mergify[bot] and jackcmay authored Aug 25, 2020
1 parent 08bece7 commit ad36dde
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion programs/bpf_loader/src/syscalls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use solana_sdk::{
account::Account,
account::KeyedAccount,
account_info::AccountInfo,
bpf_loader,
bpf_loader, bpf_loader_deprecated,
entrypoint::SUCCESS,
entrypoint_native::{ComputeMeter, InvokeContext, Logger},
instruction::{AccountMeta, Instruction, InstructionError},
Expand Down Expand Up @@ -886,6 +886,7 @@ fn call<'a>(
message_processor.add_program(*program_id, *process_instruction);
}
message_processor.add_loader(bpf_loader::id(), crate::process_instruction);
message_processor.add_loader(bpf_loader_deprecated::id(), crate::process_instruction);
message_processor.set_cross_program_support(invoke_context.is_cross_program_supported());

#[allow(clippy::deref_addrof)]
Expand Down

0 comments on commit ad36dde

Please sign in to comment.