Switch to solana_sdk Pack and COption

Author: jackcmay

Cargo.lock

@@ -19,9 +19,10 @@ use solana_sdk::{
     info,
     program_error::PrintProgramError,
     program_error::ProgramError,
+    program_option::COption,
+    program_pack::Pack,
     pubkey::Pubkey,
 };
-use spl_token::{option::COption, pack::Pack};
 
 // Test program id for the swap program.
 #[cfg(not(target_arch = "bpf"))]
@@ -584,7 +585,6 @@ mod tests {
     use spl_token::{
         error::TokenError,
         instruction::{approve, initialize_account, initialize_mint, mint_to, revoke},
-        pack::Pack,
         processor::Processor as SplProcessor,
         state::{Account as SplAccount, Mint as SplMint},
     };

token-swap/program/src/processor.rs

@@ -11,12 +11,12 @@ version = "2.0.1"
 [dependencies]
 clap = "2.33.3"
 serde_json = "1.0.57"
-solana-account-decoder = { version = "1.3.11" }
-solana-clap-utils = { version = "1.3.11"}
-solana-cli-config = { version = "1.3.11" }
+solana-account-decoder = { version = "1.3.12" }
+solana-clap-utils = { version = "1.3.12"}
+solana-cli-config = { version = "1.3.12" }
 solana-client = { version = "1.3.11" }
 solana-logger = { version = "1.3.12" }
-solana-sdk = { version = "1.3.11" }
+solana-sdk = { version = "1.3.12" }
 spl-token = { version = "2.0", path="../program" }
 
 [[bin]]

token/cli/Cargo.toml

@@ -12,6 +12,7 @@ use solana_client::{rpc_client::RpcClient, rpc_request::TokenAccountsFilter};
 use solana_sdk::{
     commitment_config::CommitmentConfig,
     native_token::*,
+    program_pack::Pack,
     pubkey::Pubkey,
     signature::{Keypair, Signer},
     system_instruction,
@@ -21,7 +22,6 @@ use spl_token::{
     self,
     instruction::*,
     native_mint,
-    pack::Pack,
     state::{Account, Mint},
 };
 use std::process::exit;

token/cli/src/main.rs

@@ -10,6 +10,6 @@ edition = "2018"
 [dev-dependencies]
 rand = { version = "0.7.0"}
 spl-token = { path = "../program" }
-solana-sdk = { version = "1.3.9" }
-solana-bpf-loader-program = { version = "1.3.9" }
-solana_rbpf = "=0.1.30"
+solana-sdk = { version = "1.3.12" }
+solana-bpf-loader-program = { version = "1.3.12" }
+solana_rbpf = "=0.1.31"

token/perf-monitor/Cargo.lock

@@ -2,24 +2,26 @@ use solana_bpf_loader_program::{
     create_vm,
     serialization::{deserialize_parameters, serialize_parameters},
 };
-use solana_rbpf::InstructionMeter;
+use solana_rbpf::vm::{EbpfVm, InstructionMeter};
 use solana_sdk::{
     account::{Account as SolanaAccount, KeyedAccount},
     bpf_loader,
     entrypoint::SUCCESS,
-    entrypoint_native::{ComputeBudget, ComputeMeter, InvokeContext, Logger, ProcessInstruction},
+    entrypoint_native::{
+        ComputeBudget, ComputeMeter, Executor, InvokeContext, Logger, ProcessInstruction,
+    },
     instruction::{CompiledInstruction, InstructionError},
     message::Message,
+    program_option::COption,
+    program_pack::Pack,
     pubkey::Pubkey,
     sysvar::rent::{self, Rent},
 };
 use spl_token::{
     instruction::TokenInstruction,
-    option::COption,
-    pack::Pack,
     state::{Account, Mint},
 };
-use std::{cell::RefCell, fs::File, io::Read, path::PathBuf, rc::Rc};
+use std::{cell::RefCell, fs::File, io::Read, path::PathBuf, rc::Rc, sync::Arc};
 
 fn load_program(name: &str) -> Vec<u8> {
     let mut path = PathBuf::new();
@@ -42,9 +44,14 @@ fn run_program(
     program_account.data = load_program("spl_token");
     let loader_id = bpf_loader::id();
     let mut invoke_context = MockInvokeContext::default();
+    let executable = EbpfVm::<solana_bpf_loader_program::BPFError>::create_executable_from_elf(
+        &&program_account.data,
+        None,
+    )
+    .unwrap();
     let (mut vm, heap_region) = create_vm(
         &loader_id,
-        &program_account.data,
+        executable.as_ref(),
         parameter_accounts,
         &mut invoke_context,
     )
@@ -203,6 +210,10 @@ impl InvokeContext for MockInvokeContext {
     fn get_compute_meter(&self) -> Rc<RefCell<dyn ComputeMeter>> {
         Rc::new(RefCell::new(self.compute_meter.clone()))
     }
+    fn add_executor(&mut self, _pubkey: &Pubkey, _executor: Arc<dyn Executor>) {}
+    fn get_executor(&mut self, _pubkey: &Pubkey) -> Option<Arc<dyn Executor>> {
+        None
+    }
 }
 
 #[derive(Debug, Default, Clone)]