Solana 2.3

Cargo.toml

@@ -9,51 +9,61 @@ readme = "./README.md"
 description = "Trident SVM implementation by Ackee Blockchain Security"
 
 [features]
-syscalls = ["syscall-v1", "syscall-v2"]
+syscalls = ["syscall-v2"]
 
-syscall-v1 = [
-    "trident-syscall-stubs-v1",
-    "solana_rbpf",
-]
 syscall-v2 = [
     "trident-syscall-stubs-v2",
-    "solana_rbpf",
+    "solana-sbpf",
+    "solana-transaction-context",
+    "solana-program-entrypoint",
 ]
 
 [dependencies]
 
-# Solana
-solana-sdk = "~2.0"
-solana-program-runtime = "~2.0"
-
-# Programs
-solana-system-program = "~2.0"
-solana-bpf-loader-program = "~2.0"
-solana-vote-program = "~2.0"
-solana-stake-program = "~2.0"
-solana-config-program = "~2.0"
-solana-compute-budget-program = "~2.0"
-solana-address-lookup-table-program = "~2.0"
-solana-loader-v4-program = "~2.0"
-
 # Solana SVM
-solana-svm = "~2.0"
-solana-compute-budget = "~2.0"
-solana-logger = "~2.0"
+solana-svm = "2.3"
+solana-svm-feature-set = "2.2"
+solana-svm-callback = "2.2"
+solana-program-runtime = "2.2"
+solana-bpf-loader-program = "2.2"
 
+solana-loader-v3-interface = "5"
+solana-sdk-ids = "2.2"
+solana-account = "2.2"
+solana-pubkey = "2.2"
+solana-sysvar = "2.2"
+solana-sysvar-id = "2.2"
+solana-keypair = "2.2"
+solana-transaction-error = "2.2"
+solana-transaction = {version = "2.2", features = ["blake3"]}
+solana-clock = "2.2"
+solana-rent = "2.2"
+solana-signer = "2.2"
+solana-epoch-rewards = "2.2"
+solana-epoch-schedule = "2.2"
+solana-hash = "2.2"
+solana-slot-hashes = "2.2"
+solana-slot-history = "2.2"
+solana-stake-interface = "1"
+solana-account-info = "2.2"
+solana-instruction = "2.2"
+solana-builtins = "2.2"
+solana-compute-budget = "2.3"
+solana-logger = "2.2"
+solana-fee-structure = "2.2"
 
-solana_rbpf = {version = "~0.8", optional = true}
+# agave-syscalls = "0" ## placeholder, might be used later
+
+# Stubs
+solana-sbpf = {version = "0.11", optional = true}
+solana-transaction-context = {version = "2.2", optional = true}
+solana-program-entrypoint = {version = "2.2", optional = true}
 
 # Misc
 serde = { version = "1", default-features = false }
 bincode = "1.3"
 log = "0.4"
 
-# Syscall stubs
-[dependencies.trident-syscall-stubs-v1]
-version = "0.0.1"
-optional = true
-
 [dependencies.trident-syscall-stubs-v2]
-version = "0.0.1"
+version = "0.1.0"
 optional = true

src/accounts_database/accounts_db.rs

@@ -1,12 +1,12 @@
 use std::collections::HashMap;
 
 use serde::de::DeserializeOwned;
-use solana_sdk::account::AccountSharedData;
-use solana_sdk::account::ReadableAccount;
-use solana_sdk::clock::Clock;
-use solana_sdk::pubkey::Pubkey;
-use solana_sdk::sysvar::Sysvar;
-use solana_sdk::sysvar::SysvarId;
+use solana_account::AccountSharedData;
+use solana_account::ReadableAccount;
+use solana_pubkey::Pubkey;
+use solana_sysvar::clock::Clock;
+use solana_sysvar::Sysvar;
+use solana_sysvar_id::SysvarId;
 
 use super::sysvar_tracker::SysvarTracker;
 
@@ -58,7 +58,8 @@ impl AccountsDB {
         let _ = self.programs.insert(pubkey.to_owned(), account.to_owned());
     }
     pub(crate) fn set_sysvar<T: Sysvar + SysvarId>(&mut self, sysvar: &T) {
-        let account = AccountSharedData::new_data(1, &sysvar, &solana_sdk::sysvar::id()).unwrap();
+        let account =
+            AccountSharedData::new_data(1, &sysvar, &solana_sdk_ids::sysvar::id()).unwrap();
         let _ = self.sysvars.insert(T::id(), account);
 
         if T::id() == Clock::id() {

src/accounts_database/methods.rs

@@ -1,9 +1,8 @@
-use solana_sdk::account::AccountSharedData;
-use solana_sdk::account::ReadableAccount;
-
-use solana_sdk::clock::Clock;
-use solana_sdk::pubkey::Pubkey;
-use solana_sdk::sysvar::SysvarId;
+use solana_account::AccountSharedData;
+use solana_account::ReadableAccount;
+use solana_pubkey::Pubkey;
+use solana_sysvar::clock::Clock;
+use solana_sysvar_id::SysvarId;
 
 use super::accounts_db::AccountsDB;
 

src/accounts_database/sysvar_tracker.rs

@@ -1,4 +1,4 @@
-use solana_sdk::clock::Clock;
+use solana_sysvar::clock::Clock;
 
 use crate::utils::get_current_timestamp;
 
@@ -29,7 +29,7 @@ mod tests {
     use std::thread::sleep;
     use std::time::Duration;
 
-    use solana_sdk::clock::Clock;
+    use solana_sysvar::clock::Clock;
 
     use crate::accounts_database::accounts_db::AccountsDB;
 

src/builder.rs

@@ -3,7 +3,7 @@ use crate::trident_svm_log::setup_cli_logging;
 use crate::trident_svm_log::setup_file_logging;
 use crate::trident_svm_log::turn_off_solana_logging;
 use crate::types::trident_account::TridentAccountSharedData;
-#[cfg(any(feature = "syscall-v1", feature = "syscall-v2"))]
+#[cfg(feature = "syscall-v2")]
 use crate::types::trident_entrypoint::TridentEntrypoint;
 use crate::types::trident_program::TridentProgram;
 
@@ -13,7 +13,7 @@ pub struct TridentSVMConfig {
     syscalls_v2: bool,
     cli_logs: bool, // TODO, add better debbug levels
     debug_file_logs: Option<String>,
-    #[cfg(any(feature = "syscall-v1", feature = "syscall-v2"))]
+    #[cfg(feature = "syscall-v2")]
     program_entrypoints: Vec<TridentEntrypoint>,
     program_binaries: Vec<TridentProgram>,
     permanent_accounts: Vec<TridentAccountSharedData>,
@@ -41,7 +41,7 @@ impl TridentSVMBuilder {
         self
     }
 
-    #[cfg(any(feature = "syscall-v1", feature = "syscall-v2"))]
+    #[cfg(feature = "syscall-v2")]
     pub fn with_program_entries(&mut self, entries: Vec<TridentEntrypoint>) -> &Self {
         self.config.program_entrypoints = entries;
         self
@@ -70,10 +70,6 @@ impl TridentSVMBuilder {
     pub fn build(&self) -> TridentSVM {
         let mut svm = TridentSVM::default();
 
-        #[cfg(feature = "syscall-v1")]
-        if self.config.syscalls_v1 {
-            svm.initialize_syscalls_v1();
-        }
         #[cfg(feature = "syscall-v2")]
         if self.config.syscalls_v2 {
             svm.initialize_syscalls_v2();
@@ -87,7 +83,7 @@ impl TridentSVMBuilder {
             turn_off_solana_logging();
         }
 
-        #[cfg(any(feature = "syscall-v1", feature = "syscall-v2"))]
+        #[cfg(feature = "syscall-v2")]
         for entry in &self.config.program_entrypoints {
             svm.deploy_entrypoint_program(entry);
         }

src/builtin_function.rs

@@ -1,15 +1,13 @@
 #![allow(clippy::not_unsafe_ptr_arg_deref)]
 
-use solana_bpf_loader_program::serialization::serialize_parameters;
 use solana_program_runtime::invoke_context::InvokeContext;
-use solana_sdk::transaction_context::IndexOfAccount;
+use solana_program_runtime::serialization::serialize_parameters;
+use solana_transaction_context::IndexOfAccount;
 use std::collections::HashMap;
 
-use solana_rbpf::aligned_memory::AlignedMemory;
-use solana_rbpf::ebpf::HOST_ALIGN;
+use solana_sbpf::aligned_memory::AlignedMemory;
+use solana_sbpf::ebpf::HOST_ALIGN;
 
-#[cfg(feature = "syscall-v1")]
-use trident_syscall_stubs_v1::set_invoke_context as set_invoke_context_v1;
 #[cfg(feature = "syscall-v2")]
 use trident_syscall_stubs_v2::set_invoke_context as set_invoke_context_v2;
 
@@ -19,9 +17,9 @@ macro_rules! processor {
         Some(|vm, _arg0, _arg1, _arg2, _arg3, _arg4| {
             let vm = unsafe {
                 &mut *((vm as *mut u64).offset(
-                    -($crate::processor::solana_rbpf::vm::get_runtime_environment_key() as isize),
+                    -($crate::processor::solana_sbpf::vm::get_runtime_environment_key() as isize),
                 )
-                    as *mut $crate::processor::solana_rbpf::vm::EbpfVm<
+                    as *mut $crate::processor::solana_sbpf::vm::EbpfVm<
                         $crate::processor::solana_program_runtime::invoke_context::InvokeContext,
                     >)
             };
@@ -33,7 +31,7 @@ macro_rules! processor {
                     Err(err) => {
                         vm.program_result = Err(err)
                             .map_err(|err| {
-                                $crate::processor::solana_rbpf::error::EbpfError::SyscallError(err)
+                                $crate::processor::solana_sbpf::error::EbpfError::SyscallError(err)
                             })
                             .into();
                         return;
@@ -99,7 +97,7 @@ macro_rules! processor {
                         {
                             vm.program_result = Err(err)
                                 .map_err(|err| {
-                                    $crate::processor::solana_rbpf::error::EbpfError::SyscallError(err)
+                                    $crate::processor::solana_sbpf::error::EbpfError::SyscallError(err)
                                 }).into();
                         }
                         return;
@@ -119,7 +117,7 @@ macro_rules! processor {
                     {
                         vm.program_result = Err(err)
                             .map_err(|err| {
-                                $crate::processor::solana_rbpf::error::EbpfError::SyscallError(err)
+                                $crate::processor::solana_sbpf::error::EbpfError::SyscallError(err)
                             })
                             .into();
                     }
@@ -146,7 +144,7 @@ macro_rules! processor {
                 Err(err) => {
                     vm.program_result = Err(err)
                         .map_err(|err| {
-                            $crate::processor::solana_rbpf::error::EbpfError::SyscallError(err)
+                            $crate::processor::solana_sbpf::error::EbpfError::SyscallError(err)
                         })
                         .into();
                     return;
@@ -165,8 +163,6 @@ pub fn pre_invocation(
     ),
     Box<dyn std::error::Error>,
 > {
-    #[cfg(feature = "syscall-v1")]
-    set_invoke_context_v1(invoke_context);
     #[cfg(feature = "syscall-v2")]
     set_invoke_context_v2(invoke_context);
 
@@ -180,7 +176,7 @@ pub fn pre_invocation(
         instruction_account_indices.collect();
 
     let (parameter_bytes, _regions, _account_lengths) =
-        serialize_parameters(transaction_context, instruction_context, true)?;
+        serialize_parameters(transaction_context, instruction_context, true, true)?;
 
     Ok((parameter_bytes, deduplicated_indices))
 }

src/lib.rs

@@ -1,30 +1,31 @@
 mod accounts_database;
 mod builder;
 mod methods;
-mod native;
 mod trident_fork_graphs;
 pub mod trident_svm_log;
 mod utils;
 
-#[cfg(any(feature = "syscall-v1", feature = "syscall-v2"))]
+#[cfg(feature = "syscall-v2")]
 pub mod builtin_function;
 pub mod trident_svm;
 pub mod types;
 
 pub mod processor {
-    #[cfg(any(feature = "syscall-v1", feature = "syscall-v2"))]
+    #[cfg(feature = "syscall-v2")]
     pub use crate::builtin_function::post_invocation;
-    #[cfg(any(feature = "syscall-v1", feature = "syscall-v2"))]
+    #[cfg(feature = "syscall-v2")]
     pub use crate::builtin_function::pre_invocation;
 
+    #[cfg(feature = "syscall-v2")]
+    pub use solana_program_entrypoint::deserialize;
+
+    pub use solana_account_info as account_info;
+    pub use solana_instruction::error::InstructionError;
     pub use solana_program_runtime;
     pub use solana_program_runtime::stable_log;
-    #[cfg(any(feature = "syscall-v1", feature = "syscall-v2"))]
-    pub use solana_rbpf;
-    pub use solana_sdk::account_info;
-    pub use solana_sdk::entrypoint::deserialize;
-    pub use solana_sdk::instruction::InstructionError;
-    pub use solana_sdk::pubkey::Pubkey;
+    pub use solana_pubkey::Pubkey;
+    #[cfg(feature = "syscall-v2")]
+    pub use solana_sbpf;
 }
 
 pub mod prelude {

src/methods/trident_svm_accounts.rs

@@ -1,27 +1,20 @@
-use solana_sdk::pubkey::Pubkey;
+use solana_sysvar::Sysvar;
+use solana_sysvar_id::SysvarId;
 
-use solana_sdk::account::AccountSharedData;
-use solana_sdk::account::ReadableAccount;
+use solana_account::AccountSharedData;
+use solana_account::ReadableAccount;
 
-use solana_sdk::sysvar::Sysvar;
-use solana_sdk::sysvar::SysvarId;
+use solana_keypair::Keypair;
+use solana_pubkey::Pubkey;
 
 use crate::trident_svm::TridentSVM;
 
 impl TridentSVM {
-    pub fn get_account(
-        &self,
-        pubkey: &solana_sdk::pubkey::Pubkey,
-    ) -> Option<solana_sdk::account::AccountSharedData> {
+    pub fn get_account(&self, pubkey: &Pubkey) -> Option<AccountSharedData> {
         self.accounts.get_account(pubkey)
     }
 
-    pub fn set_account(
-        &mut self,
-        pubkey: &solana_sdk::pubkey::Pubkey,
-        account: &solana_sdk::account::AccountSharedData,
-        permanent: bool,
-    ) {
+    pub fn set_account(&mut self, pubkey: &Pubkey, account: &AccountSharedData, permanent: bool) {
         if permanent {
             self.accounts.set_permanent_account(pubkey, account);
         } else {
@@ -36,12 +29,12 @@ impl TridentSVM {
     pub fn set_sysvar<T: Sysvar + SysvarId>(&mut self, sysvar: &T) {
         self.accounts.set_sysvar(sysvar);
     }
-    pub fn get_payer(&self) -> solana_sdk::signature::Keypair {
+    pub fn get_payer(&self) -> Keypair {
         self.payer.insecure_clone()
     }
     pub(crate) fn settle_accounts(&mut self, accounts: &[(Pubkey, AccountSharedData)]) {
         for account in accounts {
-            if !account.1.executable() && account.1.owner() != &solana_sdk::sysvar::id() {
+            if !account.1.executable() && account.1.owner() != &solana_sdk_ids::sysvar::id() {
                 // Update permanent account if it should be updated
                 if self.accounts.get_permanent_account(&account.0).is_some() {
                     self.accounts.set_permanent_account(&account.0, &account.1);