replace low-hanging fruit dependencies on solana-program (#6351)

Author: t-nelson

Cargo.lock

@@ -144,7 +144,7 @@ impl BlockhashQueue {
 
     #[deprecated(
         since = "2.0.0",
-        note = "Please use `solana_program::clock::MAX_PROCESSING_AGE`"
+        note = "Please use `solana_clock::MAX_PROCESSING_AGE`"
     )]
     pub fn get_max_age(&self) -> usize {
         self.max_age

accounts-db/src/blockhash_queue.rs

@@ -14,10 +14,15 @@ borsh = { workspace = true }
 futures = { workspace = true }
 solana-account = { workspace = true }
 solana-banks-interface = { workspace = true }
+solana-clock = { workspace = true }
 solana-commitment-config = { workspace = true }
+solana-hash = { workspace = true }
 solana-message = { workspace = true }
-solana-program = { workspace = true }
+solana-program-pack = { workspace = true }
+solana-pubkey = { workspace = true }
+solana-rent = { workspace = true }
 solana-signature = { workspace = true }
+solana-sysvar = { workspace = true }
 solana-transaction = { workspace = true }
 solana-transaction-context = { workspace = true }
 solana-transaction-error = { workspace = true }

banks-client/Cargo.toml

@@ -17,12 +17,15 @@ use {
         BanksRequest, BanksResponse, BanksTransactionResultWithMetadata,
         BanksTransactionResultWithSimulation,
     },
+    solana_clock::Slot,
     solana_commitment_config::CommitmentLevel,
+    solana_hash::Hash,
     solana_message::Message,
-    solana_program::{
-        clock::Slot, hash::Hash, program_pack::Pack, pubkey::Pubkey, rent::Rent, sysvar::Sysvar,
-    },
+    solana_program_pack::Pack,
+    solana_pubkey::Pubkey,
+    solana_rent::Rent,
     solana_signature::Signature,
+    solana_sysvar::Sysvar,
     solana_transaction::versioned::VersionedTransaction,
     tarpc::{
         client::{self, NewClient, RequestDispatch},

banks-client/src/lib.rs

@@ -33,11 +33,11 @@ solana-hash = { workspace = true }
 solana-message = { workspace = true }
 solana-native-token = { workspace = true }
 solana-packet = { workspace = true }
-solana-program = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-rpc-client-api = { workspace = true }
 solana-sdk-ids = { workspace = true }
 solana-signature = { workspace = true }
+solana-stake-interface = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-sysvar = { workspace = true }
 solana-transaction = { workspace = true, features = ["verify"] }

cli-output/Cargo.toml

@@ -26,13 +26,13 @@ use {
     solana_epoch_info::EpochInfo,
     solana_hash::Hash,
     solana_native_token::lamports_to_sol,
-    solana_program::stake::state::{Authorized, Lockup},
     solana_pubkey::Pubkey,
     solana_rpc_client_api::response::{
         RpcAccountBalance, RpcContactInfo, RpcInflationGovernor, RpcInflationRate, RpcKeyedAccount,
         RpcSupply, RpcVoteAccountInfo,
     },
     solana_signature::Signature,
+    solana_stake_interface::state::{Authorized, Lockup},
     solana_sysvar::stake_history::StakeHistoryEntry,
     solana_transaction::{versioned::VersionedTransaction, Transaction},
     solana_transaction_error::TransactionError,

cli-output/src/cli_output.rs

@@ -11,9 +11,9 @@ use {
     solana_hash::Hash,
     solana_message::{compiled_instruction::CompiledInstruction, v0::MessageAddressTableLookup},
     solana_native_token::lamports_to_sol,
-    solana_program::stake,
     solana_pubkey::Pubkey,
     solana_signature::Signature,
+    solana_stake_interface as stake,
     solana_transaction::versioned::{TransactionVersion, VersionedTransaction},
     solana_transaction_error::TransactionError,
     solana_transaction_status::{

cli-output/src/display.rs

@@ -31,6 +31,7 @@ serde_derive = { workspace = true }
 serde_json = { workspace = true }
 solana-account = "=2.2.1"
 solana-account-decoder = { workspace = true }
+solana-address-lookup-table-interface = { workspace = true }
 solana-borsh = "=2.2.1"
 solana-bpf-loader-program = { workspace = true }
 solana-clap-utils = { workspace = true }
@@ -61,7 +62,6 @@ solana-native-token = "=2.2.2"
 solana-nonce = "=2.2.1"
 solana-offchain-message = { version = "=2.2.1", features = ["verify"] }
 solana-packet = "=2.2.1"
-solana-program = { version = "=2.2.1", default-features = false }
 solana-program-runtime = { workspace = true }
 solana-pubkey = { version = "=2.4.0", default-features = false }
 solana-pubsub-client = { workspace = true }

cli/Cargo.toml

@@ -2,19 +2,19 @@ use {
     crate::cli::{CliCommand, CliCommandInfo, CliConfig, CliError, ProcessResult},
     clap::{App, AppSettings, Arg, ArgMatches, SubCommand},
     solana_account::from_account,
-    solana_clap_utils::{self, input_parsers::*, input_validators::*, keypair::*},
-    solana_cli_output::{CliAddressLookupTable, CliAddressLookupTableCreated, CliSignature},
-    solana_clock::Clock,
-    solana_commitment_config::CommitmentConfig,
-    solana_message::Message,
-    solana_program::address_lookup_table::{
-        self,
+    solana_address_lookup_table_interface::{
+        self as address_lookup_table,
         instruction::{
             close_lookup_table, create_lookup_table, deactivate_lookup_table, extend_lookup_table,
             freeze_lookup_table,
         },
         state::AddressLookupTable,
     },
+    solana_clap_utils::{self, input_parsers::*, input_validators::*, keypair::*},
+    solana_cli_output::{CliAddressLookupTable, CliAddressLookupTableCreated, CliSignature},
+    solana_clock::Clock,
+    solana_commitment_config::CommitmentConfig,
+    solana_message::Message,
     solana_pubkey::Pubkey,
     solana_remote_wallet::remote_wallet::RemoteWalletManager,
     solana_rpc_client::rpc_client::RpcClient,

cli/src/address_lookup_table.rs

@@ -20,7 +20,6 @@ use {
     solana_instruction::error::InstructionError,
     solana_keypair::{read_keypair_file, Keypair},
     solana_offchain_message::OffchainMessage,
-    solana_program::stake::{instruction::LockupArgs, state::Lockup},
     solana_pubkey::Pubkey,
     solana_remote_wallet::remote_wallet::RemoteWalletManager,
     solana_rpc_client::rpc_client::RpcClient,
@@ -31,6 +30,7 @@ use {
     solana_rpc_client_nonce_utils::blockhash_query::BlockhashQuery,
     solana_signature::Signature,
     solana_signer::{Signer, SignerError},
+    solana_stake_interface::{instruction::LockupArgs, state::Lockup},
     solana_tps_client::{utils::create_connection_cache, TpsClient},
     solana_tpu_client::tpu_client::{
         TpuClient, TpuClientConfig, DEFAULT_TPU_CONNECTION_POOL_SIZE, DEFAULT_TPU_ENABLE_UDP,

cli/src/cli.rs

@@ -33,7 +33,6 @@ use {
     solana_message::Message,
     solana_native_token::lamports_to_sol,
     solana_nonce::state::State as NonceState,
-    solana_program::stake::{self, state::StakeStateV2},
     solana_pubkey::Pubkey,
     solana_pubsub_client::pubsub_client::PubsubClient,
     solana_remote_wallet::remote_wallet::RemoteWalletManager,
@@ -53,6 +52,7 @@ use {
     solana_sdk_ids::sysvar::{self, stake_history},
     solana_signature::Signature,
     solana_slot_history::{self as slot_history, SlotHistory},
+    solana_stake_interface::{self as stake, state::StakeStateV2},
     solana_system_interface::{instruction as system_instruction, MAX_PERMITTED_DATA_LENGTH},
     solana_tps_client::TpsClient,
     solana_transaction::Transaction,

cli/src/cluster_query.rs

@@ -37,12 +37,6 @@ use {
     solana_epoch_schedule::EpochSchedule,
     solana_message::Message,
     solana_native_token::Sol,
-    solana_program::stake::{
-        self,
-        instruction::{self as stake_instruction, LockupArgs, StakeError},
-        state::{Authorized, Lockup, Meta, StakeActivationStatus, StakeAuthorize, StakeStateV2},
-        tools::{acceptable_reference_epoch_credits, eligible_for_deactivate_delinquent},
-    },
     solana_pubkey::Pubkey,
     solana_remote_wallet::remote_wallet::RemoteWalletManager,
     solana_rpc_client::rpc_client::RpcClient,
@@ -56,6 +50,13 @@ use {
         system_program,
         sysvar::{clock, stake_history},
     },
+    solana_stake_interface::{
+        self as stake,
+        error::StakeError,
+        instruction::{self as stake_instruction, LockupArgs},
+        state::{Authorized, Lockup, Meta, StakeActivationStatus, StakeAuthorize, StakeStateV2},
+        tools::{acceptable_reference_epoch_credits, eligible_for_deactivate_delinquent},
+    },
     solana_system_interface::{error::SystemError, instruction as system_instruction},
     solana_sysvar::stake_history::StakeHistory,
     solana_transaction::Transaction,

cli/src/stake.rs

@@ -36,8 +36,8 @@ solana-builtins-default-costs = { workspace = true, features = ["dev-context-onl
 solana-hash = { workspace = true }
 solana-keypair = { workspace = true }
 solana-message = { workspace = true }
-solana-program = { workspace = true }
 solana-signer = { workspace = true }
+solana-stake-interface = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-transaction = { workspace = true, features = ["blake3"] }
 

compute-budget-instruction/Cargo.toml

@@ -516,7 +516,7 @@ mod test {
     fn test_builtin_program_migration() {
         let tx = build_sanitized_transaction(&[
             Instruction::new_with_bincode(Pubkey::new_unique(), &(), vec![]),
-            solana_program::stake::instruction::delegate_stake(
+            solana_stake_interface::instruction::delegate_stake(
                 &Pubkey::new_unique(),
                 &Pubkey::new_unique(),
                 &Pubkey::new_unique(),

compute-budget-instruction/src/compute_budget_instruction_details.rs

@@ -27,7 +27,6 @@ solana-banks-server = { workspace = true }
 solana-clock = { workspace = true }
 solana-commitment-config = { workspace = true }
 solana-compute-budget = { workspace = true }
-solana-cpi = { workspace = true }
 solana-epoch-rewards = { workspace = true }
 solana-epoch-schedule = { workspace = true }
 solana-fee-calculator = { workspace = true }
@@ -67,6 +66,7 @@ thiserror = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 
 [dev-dependencies]
+solana-cpi = { workspace = true }
 solana-program = { workspace = true }
 solana-stake-program = { workspace = true }
 test-case = { workspace = true }

program-test/Cargo.toml

@@ -1,10 +1,9 @@
 use {
     solana_account_info::{next_account_info, AccountInfo},
-    solana_cpi::invoke,
     solana_instruction::{AccountMeta, Instruction},
     solana_keypair::Keypair,
     solana_msg::msg,
-    solana_program::instruction::get_stack_height,
+    solana_program::{instruction::get_stack_height, program::invoke},
     solana_program_entrypoint::{ProgramResult, MAX_PERMITTED_DATA_INCREASE},
     solana_program_test::{processor, ProgramTest},
     solana_pubkey::Pubkey,

program-test/tests/cpi.rs

@@ -1,8 +1,8 @@
 use {
     solana_account_info::{next_account_info, AccountInfo},
-    solana_cpi::invoke,
     solana_instruction::{AccountMeta, Instruction},
     solana_keypair::Keypair,
+    solana_program::program::invoke,
     solana_program_error::ProgramResult,
     solana_program_test::{processor, ProgramTest},
     solana_pubkey::Pubkey,

program-test/tests/realloc.rs

@@ -3,12 +3,12 @@ use {
     solana_account::{state_traits::StateMut, AccountSharedData},
     solana_bpf_loader_program::Entrypoint,
     solana_instruction::AccountMeta,
-    solana_program::{
-        bpf_loader_upgradeable::{self, UpgradeableLoaderState},
-        loader_upgradeable_instruction::UpgradeableLoaderInstruction,
+    solana_loader_v3_interface::{
+        instruction::UpgradeableLoaderInstruction, state::UpgradeableLoaderState,
     },
     solana_program_runtime::invoke_context::mock_process_instruction,
     solana_pubkey::Pubkey,
+    solana_sdk_ids::bpf_loader_upgradeable,
 };
 
 #[derive(Default)]