NDEV-3414. Update solana-sdk to 2.0.14 version

evm_loader/Cargo.toml

@@ -12,19 +12,21 @@ members = [
 ]
 
 [workspace.dependencies]
-solana-clap-utils = "=1.18.18"
-solana-cli = "=1.18.18"
-solana-cli-config = "=1.18.18"
-solana-client = "=1.18.18"
-solana-account-decoder = "=1.18.18"
-solana-program = { version = "=1.18.18", default-features = false }
-solana-sdk = "=1.18.18"
-solana-program-runtime = "=1.18.18"
-solana-runtime = { version = "=1.18.18", features = ["dev-context-only-utils"] }
-solana-accounts-db = "=1.18.18"
-solana-bpf-loader-program = "=1.18.18"
-solana-loader-v4-program = "=1.18.18"
-solana-transaction-status = "=1.18.18"
+solana-clap-utils = "=2.0.14"
+solana-cli = "=2.0.14"
+solana-cli-config = "=2.0.14"
+solana-client = "=2.0.14"
+solana-account-decoder = "=2.0.14"
+solana-program = { version = "=2.0.14", default-features = false }
+solana-sdk = "=2.0.14"
+solana-program-runtime = "=2.0.14"
+solana-runtime = { version = "=2.0.14", features = ["dev-context-only-utils"] }
+solana-accounts-db = { version = "=2.0.14", default-features = false }
+solana-bpf-loader-program = "=2.0.14"
+solana-loader-v4-program = "=2.0.14"
+solana-transaction-status = "=2.0.14"
+solana-compute-budget = "=2.0.14"
+solana-svm = "=2.0.14"
 
 [profile.test]
 debug = true

evm_loader/lib/Cargo.toml

@@ -23,8 +23,10 @@ solana-accounts-db.workspace = true
 solana-bpf-loader-program.workspace = true
 solana-loader-v4-program.workspace = true
 solana-transaction-status.workspace = true
-spl-token = { version = "~4.0", default-features = false, features = ["no-entrypoint"] }
-spl-associated-token-account = { version = "~2.3", default-features = false, features = ["no-entrypoint"] }
+solana-compute-budget.workspace = true
+solana-svm.workspace = true
+spl-token = { version = "~6.0", default-features = false, features = ["no-entrypoint"] }
+spl-associated-token-account = { version = ">=3.0", default-features = false, features = ["no-entrypoint"] }
 bs58 = "0.5.1"
 base64 = "0.22"
 hex = { version = "0.4", features = ["serde"] }

evm_loader/lib/src/account_storage.rs

@@ -207,7 +207,7 @@ impl<'rpc, T: Rpc + BuildConfigSimulator> EmulatorAccountStorage<'rpc, T> {
             block_number_used: RefCell::new(false),
             block_timestamp: other.block_timestamp.saturating_add(timestamp_shift),
             block_timestamp_used: RefCell::new(false),
-            rent: other.rent,
+            rent: other.rent.clone(),
             state_overrides: other.state_overrides.clone(),
             accounts_cache: other.accounts_cache.clone(),
             used_accounts: other.used_accounts.clone(),
@@ -1376,7 +1376,7 @@ impl<T: Rpc> SyncedAccountStorage for EmulatorAccountStorage<'_, T> {
             .await
             .map_err(|e| EvmLoaderError::Custom(e.to_string()))?;
 
-        solana_simulator.set_clock(Clock {
+        solana_simulator.set_clock(&Clock {
             slot: self.block_number,
             epoch_start_timestamp: self.block_timestamp,
             epoch: 0,

evm_loader/lib/src/commands/simulate_solana.rs

@@ -10,7 +10,7 @@ use bincode::Options;
 use log::info;
 use serde::{Deserialize, Serialize};
 use serde_with::serde_as;
-use solana_program_runtime::compute_budget::ComputeBudget;
+use solana_compute_budget::compute_budget::ComputeBudget;
 use solana_runtime::runtime_config::RuntimeConfig;
 use solana_sdk::{
     pubkey::Pubkey,

evm_loader/lib/src/errors.rs

@@ -48,7 +48,7 @@ pub enum NeonError {
     EvmError(#[from] evm_loader::error::Error),
     #[error("Can't load db config")]
     LoadingDBConfigError,
-    /// Need specify evm_loader
+    /// Need specify `evm_loader`
     #[error("EVM loader must be specified.")]
     EvmLoaderNotSpecified,
     /// Need specify fee payer