Add Cross-program invocations (#9582)

solana-labs · Apr 28, 2020 · 068f12f · 068f12f
1 parent 063f616
commit 068f12f
Show file tree

Hide file tree

Showing 27 changed files with 2,164 additions and 208 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock
diff --git a/programs/bpf/Cargo.toml b/programs/bpf/Cargo.toml
@@ -40,6 +40,8 @@ members = [
     "rust/dup_accounts",
     "rust/error_handling",
     "rust/external_spend",
+    "rust/invoke",
+    "rust/invoked",
     "rust/iter",
     "rust/many_args",
     "rust/many_args_dep",

diff --git a/programs/bpf/benches/bpf_loader.rs b/programs/bpf/benches/bpf_loader.rs
@@ -4,6 +4,14 @@ extern crate test;
 
 use byteorder::{ByteOrder, LittleEndian, WriteBytesExt};
 use solana_rbpf::EbpfVm;
+use solana_sdk::{
+    account::Account,
+    entrypoint_native::InvokeContext,
+    instruction::{CompiledInstruction, InstructionError},
+    message::Message,
+    pubkey::Pubkey,
+};
+use std::{cell::RefCell, rc::Rc};
 use std::{env, fs::File, io::Read, mem, path::PathBuf};
 use test::Bencher;
 
@@ -69,9 +77,10 @@ fn bench_program_alu(bencher: &mut Bencher) {
         .write_u64::<LittleEndian>(ARMSTRONG_LIMIT)
         .unwrap();
     inner_iter.write_u64::<LittleEndian>(0).unwrap();
+    let mut invoke_context = MockInvokeContext::default();
 
     let elf = load_elf().unwrap();
-    let (mut vm, _) = solana_bpf_loader_program::create_vm(&elf).unwrap();
+    let (mut vm, _) = solana_bpf_loader_program::create_vm(&elf, &mut invoke_context).unwrap();
 
     println!("Interpreted:");
     assert_eq!(
@@ -122,3 +131,21 @@ fn bench_program_alu(bencher: &mut Bencher) {
     // println!("  {:?} MIPS", mips);
     // println!("{{ \"type\": \"bench\", \"name\": \"bench_program_alu_jit_to_native_mips\", \"median\": {:?}, \"deviation\": 0 }}", mips);
 }
+
+#[derive(Debug, Default)]
+pub struct MockInvokeContext {}
+impl InvokeContext for MockInvokeContext {
+    fn push(&mut self, _key: &Pubkey) -> Result<(), InstructionError> {
+        Ok(())
+    }
+    fn pop(&mut self) {}
+    fn verify_and_update(
+        &mut self,
+        _message: &Message,
+        _instruction: &CompiledInstruction,
+        _signers: &[Pubkey],
+        _accounts: &[Rc<RefCell<Account>>],
+    ) -> Result<(), InstructionError> {
+        Ok(())
+    }
+}
diff --git a/programs/bpf/build.rs b/programs/bpf/build.rs
@@ -71,6 +71,8 @@ fn main() {
             "dup_accounts",
             "error_handling",
             "external_spend",
+            "invoke",
+            "invoked",
             "iter",
             "many_args",
             "noop",