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

Fix #21397 (#21535)

Browse Source 
Adds InvokeContext::get_instruction_keyed_accounts() to skip first_instruction_account keyed_accounts in CPI.
This commit is contained in:
Alexander Meißner
2021-12-01 14:57:59 +01:00
committed by GitHub
parent 1f13fd64bd
commit 3da914330d
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
program-runtime/src/invoke_context.rs
View File

@ -277,6 +277,8 @@ pub trait InvokeContext {
fn remove_first_keyed_account(&mut self) -> Result<(), InstructionError>; fn remove_first_keyed_account(&mut self) -> Result<(), InstructionError>;
/// Get the list of keyed accounts /// Get the list of keyed accounts
fn get_keyed_accounts(&self) -> Result<&[KeyedAccount], InstructionError>; fn get_keyed_accounts(&self) -> Result<&[KeyedAccount], InstructionError>;
/// Get the list of keyed accounts skipping `first_instruction_account` many entries
fn get_instruction_keyed_accounts(&self) -> Result<&[KeyedAccount], InstructionError>;
/// Get this invocation's LogCollector /// Get this invocation's LogCollector
fn get_log_collector(&self) -> Option<Rc<RefCell<LogCollector>>>; fn get_log_collector(&self) -> Option<Rc<RefCell<LogCollector>>>;
/// Get this invocation's ComputeMeter /// Get this invocation's ComputeMeter
@ -621,7 +623,7 @@ impl<'a> InvokeContext for ThisInvokeContext<'a> {
let message = Message::new(&[instruction.clone()], None); let message = Message::new(&[instruction.clone()], None);
// Gather keyed_accounts in the order of message.account_keys // Gather keyed_accounts in the order of message.account_keys
let caller_keyed_accounts = self.get_keyed_accounts()?; let caller_keyed_accounts = self.get_instruction_keyed_accounts()?;
let callee_keyed_accounts = message let callee_keyed_accounts = message
.account_keys .account_keys
.iter() .iter()
@ -815,6 +817,17 @@ impl<'a> InvokeContext for ThisInvokeContext<'a> {
.map(|frame| &frame.keyed_accounts[frame.keyed_accounts_range.clone()]) .map(|frame| &frame.keyed_accounts[frame.keyed_accounts_range.clone()])
.ok_or(InstructionError::CallDepth) .ok_or(InstructionError::CallDepth)
} }
fn get_instruction_keyed_accounts(&self) -> Result<&[KeyedAccount], InstructionError> {
let frame = self
.invoke_stack
.last()
.ok_or(InstructionError::CallDepth)?;
let first_instruction_account = frame
.number_of_program_accounts
.checked_sub(1)
.ok_or(InstructionError::CallDepth)?;
Ok(&frame.keyed_accounts[first_instruction_account..])
}
fn get_log_collector(&self) -> Option<Rc<RefCell<LogCollector>>> { fn get_log_collector(&self) -> Option<Rc<RefCell<LogCollector>>> {
self.log_collector.clone() self.log_collector.clone()
} }

2
programs/bpf_loader/src/syscalls.rs
View File

@ -2003,7 +2003,7 @@ where
let demote_program_write_locks = let demote_program_write_locks =
invoke_context.is_feature_active(&demote_program_write_locks::id()); invoke_context.is_feature_active(&demote_program_write_locks::id());
let keyed_accounts = invoke_context let keyed_accounts = invoke_context
.get_keyed_accounts() .get_instruction_keyed_accounts()
.map_err(SyscallError::InstructionError)?; .map_err(SyscallError::InstructionError)?;
let mut account_indices = Vec::with_capacity(message.account_keys.len()); let mut account_indices = Vec::with_capacity(message.account_keys.len());
let mut accounts = Vec::with_capacity(message.account_keys.len()); let mut accounts = Vec::with_capacity(message.account_keys.len());