Adds keyed_accounts property and getter to InvokeContext.

solana-labs · Feb 18, 2021 · ed973e1 · ed973e1
1 parent 73d8693
commit ed973e1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/runtime/src/message_processor.rs b/runtime/src/message_processor.rs
@@ -215,6 +215,7 @@ pub struct ThisInvokeContext<'a> {
     rent: Rent,
     pre_accounts: Vec<PreAccount>,
     account_deps: &'a [(Pubkey, RefCell<Account>)],
+    keyed_accounts: &'a [KeyedAccount<'a>],
     programs: &'a [(Pubkey, ProcessInstructionWithContext)],
     logger: Rc<RefCell<dyn Logger>>,
     bpf_compute_budget: BpfComputeBudget,
@@ -244,6 +245,7 @@ impl<'a> ThisInvokeContext<'a> {
             rent,
             pre_accounts,
             account_deps,
+            keyed_accounts: &[], // TODO [KeyedAccounts to InvokeContext refactoring]
             programs,
             logger: Rc::new(RefCell::new(ThisLogger { log_collector })),
             bpf_compute_budget,
@@ -302,6 +304,9 @@ impl<'a> InvokeContext for ThisInvokeContext<'a> {
             .last()
             .ok_or(InstructionError::GenericError)
     }
+    fn get_keyed_accounts(&self) -> &[KeyedAccount] {
+        self.keyed_accounts
+    }
     fn get_programs(&self) -> &[(Pubkey, ProcessInstructionWithContext)] {
         self.programs
     }

diff --git a/sdk/src/process_instruction.rs b/sdk/src/process_instruction.rs
@@ -45,6 +45,8 @@ pub trait InvokeContext {
     ) -> Result<(), InstructionError>;
     /// Get the program ID of the currently executing program
     fn get_caller(&self) -> Result<&Pubkey, InstructionError>;
+    /// Get the list of keyed accounts
+    fn get_keyed_accounts(&self) -> &[KeyedAccount];
     /// Get a list of built-in programs
     fn get_programs(&self) -> &[(Pubkey, ProcessInstructionWithContext)];
     /// Get this invocation's logger
@@ -303,15 +305,16 @@ impl Logger for MockLogger {
     }
 }
 
-pub struct MockInvokeContext {
+pub struct MockInvokeContext<'a> {
     pub key: Pubkey,
     pub logger: MockLogger,
     pub bpf_compute_budget: BpfComputeBudget,
     pub compute_meter: MockComputeMeter,
+    pub keyed_accounts: &'a [KeyedAccount<'a>],
     pub programs: Vec<(Pubkey, ProcessInstructionWithContext)>,
     pub invoke_depth: usize,
 }
-impl Default for MockInvokeContext {
+impl<'a> Default for MockInvokeContext<'a> {
     fn default() -> Self {
         MockInvokeContext {
             key: Pubkey::default(),
@@ -320,12 +323,13 @@ impl Default for MockInvokeContext {
             compute_meter: MockComputeMeter {
                 remaining: std::i64::MAX as u64,
             },
+            keyed_accounts: &[], // TODO [KeyedAccounts to InvokeContext refactoring]
             programs: vec![],
             invoke_depth: 0,
         }
     }
 }
-impl InvokeContext for MockInvokeContext {
+impl<'a> InvokeContext for MockInvokeContext<'a> {
     fn push(&mut self, _key: &Pubkey) -> Result<(), InstructionError> {
         self.invoke_depth += 1;
         Ok(())
@@ -348,6 +352,9 @@ impl InvokeContext for MockInvokeContext {
     fn get_caller(&self) -> Result<&Pubkey, InstructionError> {
         Ok(&self.key)
     }
+    fn get_keyed_accounts(&self) -> &[KeyedAccount] {
+        self.keyed_accounts
+    }
     fn get_programs(&self) -> &[(Pubkey, ProcessInstructionWithContext)] {
         &self.programs
     }