feat: catchup to agave, until 2025-08-07 + bank-related modifications

Cargo.toml

@@ -107,13 +107,11 @@ members = [
     "streamer",
     "svm",
     "svm-callback",
-    "svm-conformance",
     "svm-feature-set",
     "svm-transaction",
     "syscalls",
     "syscalls/gen-syscall-list",
     "test-validator",
-    "thin-client",
     "thread-manager",
     "timings",
     "tls-utils",
@@ -541,7 +539,6 @@ solana-storage-proto = { path = "storage-proto", version = "=3.0.0" }
 solana-streamer = { path = "streamer", version = "=3.0.0" }
 solana-svm = { path = "svm", version = "=3.0.0" }
 solana-svm-callback = { path = "svm-callback", version = "=3.0.0" }
-solana-svm-conformance = { path = "svm-conformance", version = "=3.0.0" }
 solana-svm-feature-set = { path = "svm-feature-set", version = "=3.0.0" }
 solana-svm-transaction = { path = "svm-transaction", version = "=3.0.0" }
 solana-system-interface = "1.0"
@@ -550,7 +547,6 @@ solana-system-transaction = "2.2.1"
 solana-sysvar = "2.2.2"
 solana-sysvar-id = "2.2.1"
 solana-test-validator = { path = "test-validator", version = "=3.0.0" }
-solana-thin-client = { path = "thin-client", version = "=3.0.0" }
 solana-time-utils = "2.2.1"
 solana-timings = { path = "timings", version = "=3.0.0" }
 solana-tls-utils = { path = "tls-utils", version = "=3.0.0" }
@@ -585,10 +581,10 @@ spl-associated-token-account-interface = "1.0.0"
 spl-generic-token = "1.0.1"
 spl-memo-interface = "1.0.0"
 spl-pod = "0.5.1"
-spl-token = "8.0.0"
 spl-token-2022-interface = "1.0.0"
 spl-token-confidential-transfer-proof-extraction = "0.4.0"
 spl-token-group-interface = "0.6.0"
+spl-token-interface = "1.0.0"
 spl-token-metadata-interface = "0.7.0"
 static_assertions = "1.1.0"
 stream-cancel = "0.8.2"

account-decoder/Cargo.toml

@@ -45,9 +45,9 @@ solana-stake-interface = { workspace = true }
 solana-sysvar = { workspace = true }
 solana-vote-interface = { workspace = true, features = ["bincode"] }
 spl-generic-token = { workspace = true }
-spl-token = { workspace = true, features = ["no-entrypoint"] }
 spl-token-2022-interface = { workspace = true }
 spl-token-group-interface = { workspace = true }
+spl-token-interface = { workspace = true }
 spl-token-metadata-interface = { workspace = true }
 thiserror = { workspace = true }
 zstd = { workspace = true }

account-decoder/src/parse_account_data.rs

@@ -33,11 +33,11 @@ pub static PARSABLE_PROGRAM_IDS: std::sync::LazyLock<HashMap<Pubkey, ParsableAcc
         );
         m.insert(config::id(), ParsableAccount::Config);
         m.insert(system_program::id(), ParsableAccount::Nonce);
-        m.insert(spl_token::id(), ParsableAccount::SplToken);
         m.insert(
             spl_token_2022_interface::id(),
             ParsableAccount::SplToken2022,
         );
+        m.insert(spl_token_interface::id(), ParsableAccount::SplToken);
         m.insert(stake::id(), ParsableAccount::Stake);
         m.insert(sysvar::id(), ParsableAccount::Sysvar);
         m.insert(vote::id(), ParsableAccount::Vote);

accounts-cluster-bench/Cargo.toml

@@ -42,7 +42,7 @@ solana-transaction = { workspace = true }
 solana-transaction-status = { workspace = true }
 solana-version = { workspace = true }
 spl-generic-token = { workspace = true }
-spl-token = { workspace = true, features = ["no-entrypoint"] }
+spl-token-interface = { workspace = true }
 
 [target.'cfg(not(any(target_env = "msvc", target_os = "freebsd")))'.dependencies]
 jemallocator = { workspace = true }

accounts-cluster-bench/src/main.rs

@@ -31,7 +31,7 @@ use {
     solana_transaction::Transaction,
     solana_transaction_status::UiTransactionEncoding,
     spl_generic_token::token,
-    spl_token::state::Account,
+    spl_token_interface::state::Account,
     std::{
         cmp::min,
         collections::VecDeque,
@@ -228,17 +228,17 @@ fn make_create_message(
             )];
             if let Some(mint_address) = mint {
                 instructions.push(
-                    spl_token::instruction::initialize_account(
-                        &spl_token::id(),
+                    spl_token_interface::instruction::initialize_account(
+                        &spl_token_interface::id(),
                         &to_pubkey,
                         &mint_address,
                         &base_keypair.pubkey(),
                     )
                     .unwrap(),
                 );
                 instructions.push(
-                    spl_token::instruction::approve(
-                        &spl_token::id(),
+                    spl_token_interface::instruction::approve(
+                        &spl_token_interface::id(),
                         &to_pubkey,
                         &base_keypair.pubkey(),
                         &base_keypair.pubkey(),
@@ -282,8 +282,8 @@ fn make_close_message(
                 Pubkey::create_with_seed(&base_keypair.pubkey(), &seed, &program_id).unwrap();
             if spl_token {
                 Some(
-                    spl_token::instruction::close_account(
-                        &spl_token::id(),
+                    spl_token_interface::instruction::close_account(
+                        &spl_token_interface::id(),
                         &address,
                         &keypair.pubkey(),
                         &base_keypair.pubkey(),
@@ -1422,11 +1422,9 @@ pub mod test {
         solana_measure::measure::Measure,
         solana_native_token::sol_to_lamports,
         solana_poh_config::PohConfig,
+        solana_program_pack::Pack,
         solana_test_validator::TestValidator,
-        spl_token::{
-            solana_program::program_pack::Pack,
-            state::{Account, Mint},
-        },
+        spl_token_interface::state::{Account, Mint},
     };
 
     fn initialize_and_add_secondary_indexes(validator_config: &mut ValidatorConfig) {
@@ -1603,8 +1601,8 @@ pub mod test {
                     spl_mint_len as u64,
                     &token::id(),
                 ),
-                spl_token::instruction::initialize_mint(
-                    &spl_token::id(),
+                spl_token_interface::instruction::initialize_mint(
+                    &spl_token_interface::id(),
                     &spl_mint_keypair.pubkey(),
                     &spl_mint_keypair.pubkey(),
                     None,

accounts-db/benches/bench_accounts_file.rs

@@ -1,4 +1,6 @@
 #![allow(clippy::arithmetic_side_effects)]
+// TODO(ksn): remove this
+#![allow(deprecated)]
 use {
     criterion::{criterion_group, criterion_main, BatchSize, BenchmarkId, Criterion, Throughput},
     solana_account::{AccountSharedData, ReadableAccount},

accounts-db/benches/read_only_accounts_cache.rs

@@ -164,7 +164,7 @@ fn bench_read_only_accounts_cache_eviction(
     max_data_size_hi: usize,
 ) {
     // Prepare initial accounts, two times the high limit of the cache, to make
-    // sure that the backgroud threads sometimes try to store something which
+    // sure that the background threads sometimes try to store something which
     // is not in the cache.
     let accounts: Vec<_> = utils::accounts_with_size_limit(
         255,

accounts-db/benches/utils.rs

@@ -1,6 +1,8 @@
 // This file is included as a module separately in each bench, which causes
 // a `dead_code` warning if the given bench doesn't `use` all functions.
 #![allow(dead_code)]
+// TODO(ksn): remove this
+#![allow(deprecated)]
 
 use {
     rand::{

accounts-db/src/accounts_db.rs

@@ -1419,16 +1419,6 @@ pub fn default_num_hash_threads() -> NonZeroUsize {
     let num_threads = (num_cpus::get() / 8).clamp(2, 6);
     NonZeroUsize::new(num_threads).unwrap()
 }
-
-pub fn make_hash_thread_pool(num_threads: Option<NonZeroUsize>) -> ThreadPool {
-    let num_threads = num_threads.unwrap_or_else(default_num_hash_threads).get();
-    rayon::ThreadPoolBuilder::new()
-        .thread_name(|i| format!("solAcctHash{i:02}"))
-        .num_threads(num_threads)
-        .build()
-        .unwrap()
-}
-
 pub fn default_num_foreground_threads() -> usize {
     get_thread_count()
 }

accounts-db/src/accounts_db/tests.rs

@@ -4282,7 +4282,7 @@ fn start_load_thread(
                     return;
                 }
                 // Meddle load_limit to cover all branches of implementation.
-                // There should absolutely no behaviorial difference; the load_limit triggered
+                // There should absolutely no behavioral difference; the load_limit triggered
                 // slow branch should only affect the performance.
                 // Ordering::Relaxed is ok because of no data dependencies; the modified field is
                 // completely free-standing cfg(test) control-flow knob.